mirror of
git://slackware.nl/current.git
synced 2024-12-25 09:58:55 +01:00
Mon May 28 19:12:29 UTC 2018
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
This commit is contained in:
parent
d31c50870d
commit
646a5c1cbf
3955 changed files with 178856 additions and 541421 deletions
|
@ -1,205 +1,170 @@
|
|||
This file documents the instructions for upgrading to Slackware -current, the
|
||||
packages added, removed, renamed, and/or split during the development cycle
|
||||
from Slackware 14.1 through -current, and some potential "gotchas" that users
|
||||
from Slackware 14.2 through -current, and some potential "gotchas" that users
|
||||
can avoid by arming themselves with a little knowledge.
|
||||
|
||||
|
||||
*** INSTRUCTIONS FOR UPGRADING FROM 14.1 ***
|
||||
*** INSTRUCTIONS FOR UPGRADING FROM 14.2 ***
|
||||
|
||||
Follow the instructions detailed in the UPGRADE.TXT located in this
|
||||
directory.
|
||||
|
||||
Note that upgrading from a Slackware version earlier than 14.1 is NOT
|
||||
Note that upgrading from a Slackware version earlier than 14.2 is NOT
|
||||
supported at all and will most likely not work.
|
||||
|
||||
|
||||
*** PACKAGE ADDITIONS SINCE 14.1 ***
|
||||
*** PACKAGE ADDITIONS SINCE 14.2 ***
|
||||
|
||||
a/hwdata
|
||||
a/libgudev
|
||||
a/procps-ng
|
||||
a/eudev
|
||||
ap/cgmanager
|
||||
ap/cups-filters
|
||||
ap/lzip
|
||||
ap/pamixer
|
||||
ap/qpdf
|
||||
ap/squashfs-tools
|
||||
ap/usbmuxd
|
||||
d/Cython
|
||||
d/gnu-cobol
|
||||
d/python-setuptools
|
||||
d/scons
|
||||
kde/amor
|
||||
kde/artikulate
|
||||
kde/baloo
|
||||
kde/baloo-widgets
|
||||
kde/cervisia
|
||||
kde/dolphin-plugins
|
||||
kde/kajongg
|
||||
kde/kapptemplate
|
||||
kde/kcachegrind
|
||||
kde/kcron
|
||||
kde/kde-dev-scripts
|
||||
kde/kde-dev-utils
|
||||
kde/kdeconnect-kde
|
||||
kde/kdenetwork-filesharing
|
||||
kde/kdenetwork-strigi-analyzers
|
||||
kde/kdesdk-kioslaves
|
||||
kde/kdesdk-strigi-analyzers
|
||||
kde/kdesdk-thumbnailers
|
||||
kde/kdev-python
|
||||
kde/kfilemetadata
|
||||
kde/kget
|
||||
kde/kompare
|
||||
kde/kopete
|
||||
kde/kppp
|
||||
kde/krdc
|
||||
kde/krfb
|
||||
kde/ksystemlog
|
||||
kde/kteatime
|
||||
kde/ktux
|
||||
kde/kuser
|
||||
kde/kwalletmanager
|
||||
kde/libkomparediff2
|
||||
kde/libmm-qt
|
||||
kde/libnm-qt
|
||||
kde/lokalize
|
||||
kde/okteta
|
||||
kde/partitionmanager
|
||||
kde/plasma-nm
|
||||
kde/poxml
|
||||
kde/umbrello
|
||||
kde/zeroconf-ioslave
|
||||
kdei/calligra-l10n-en_GB
|
||||
kdei/calligra-l10n-eu
|
||||
kdei/calligra-l10n-ja
|
||||
kdei/kde-l10n-id
|
||||
l/ConsoleKit2
|
||||
l/LibRaw
|
||||
l/a52dec
|
||||
l/adwaita-icon-theme
|
||||
l/alsa-plugins
|
||||
l/atkmm
|
||||
l/cairomm
|
||||
l/dconf-editor
|
||||
l/eigen3
|
||||
l/elfutils
|
||||
l/glibmm
|
||||
l/gsl
|
||||
l/gst-plugins-base0
|
||||
l/gst-plugins-good0
|
||||
l/gstreamer0
|
||||
l/gtkmm2
|
||||
l/gtkmm3
|
||||
l/jemalloc
|
||||
a/hostname (split from n/net-tools)
|
||||
a/lzlib
|
||||
a/mlocate (replaces a/slocate)
|
||||
a/plzip
|
||||
ap/dash (replaces ap/ash)
|
||||
ap/man-db (replaces ap/man)
|
||||
ap/opus-tools
|
||||
ap/xorriso
|
||||
d/gcc-brig
|
||||
d/gnucobol (replaces d/gnu-cobol)
|
||||
d/patchelf
|
||||
d/python-pip
|
||||
d/python3
|
||||
d/opencl-headers
|
||||
d/rust
|
||||
l/Mako
|
||||
l/SDL2
|
||||
l/SDL2_gfx
|
||||
l/SDL2_image
|
||||
l/SDL2_mixer
|
||||
l/SDL2_net
|
||||
l/SDL2_ttf
|
||||
l/ffmpeg
|
||||
l/gst-plugins-libav
|
||||
l/id3lib
|
||||
l/lame
|
||||
l/libbluray
|
||||
l/libclc
|
||||
l/libedit
|
||||
l/libidn2
|
||||
l/libsodium
|
||||
l/libwebp
|
||||
l/ocl-icd
|
||||
l/opus
|
||||
l/opusfile
|
||||
l/pyparsing
|
||||
l/python-appdirs
|
||||
l/python-certifi
|
||||
l/python-chardet
|
||||
l/python-docutils
|
||||
l/python-idna
|
||||
l/python-packaging
|
||||
l/python-requests
|
||||
l/python-sane
|
||||
l/python-six
|
||||
l/python-urllib3
|
||||
l/speex
|
||||
l/tdb
|
||||
l/tevent
|
||||
l/talloc
|
||||
n/dovecot
|
||||
n/libmilter
|
||||
n/npth
|
||||
n/postfix
|
||||
n/sshfs
|
||||
t/texlive (replaces t/tetex and t/tetex-doc)
|
||||
x/intel-vaapi-driver (replaces x/libva-intel-driver)
|
||||
x/libXfont2
|
||||
x/libinput
|
||||
x/libva-utils
|
||||
x/libwacom
|
||||
x/urw-core35-fonts-otf
|
||||
x/vulkan-sdk
|
||||
x/xf86-input-libinput
|
||||
x/xf86-video-vboxvideo
|
||||
xap/easytag
|
||||
extra/sendmail/* (moved from main tree)
|
||||
|
||||
|
||||
*** PACKAGE REMOVALS SINCE 14.2 ***
|
||||
|
||||
a/eject (included in a/util-linux)
|
||||
a/slocate (replaced by a/mlocate)
|
||||
ap/ash (replaced by ap/dash)
|
||||
ap/man (replaced by ap/man-db)
|
||||
d/gcc-java
|
||||
d/gnu-cobol (replaced by d/gnucobol)
|
||||
l/herqq
|
||||
l/json-c
|
||||
l/judy
|
||||
l/libasyncns
|
||||
l/libcap-ng
|
||||
l/libcdio-paranoia
|
||||
l/libdvdnav
|
||||
l/libfakekey
|
||||
l/libimobiledevice
|
||||
l/libjpeg-turbo
|
||||
l/libnih
|
||||
l/libodfgen
|
||||
l/librevenge
|
||||
l/libsigc++
|
||||
l/libsigsegv
|
||||
l/libusbmuxd
|
||||
l/libvisio
|
||||
l/libvpx
|
||||
l/libwpg
|
||||
l/newt
|
||||
l/openjpeg
|
||||
l/orc
|
||||
l/pangomm
|
||||
l/pulseaudio
|
||||
l/python-pillow
|
||||
l/qt-gstreamer
|
||||
l/sbc
|
||||
l/serf
|
||||
l/speexdsp
|
||||
l/xapian-core
|
||||
n/libndp
|
||||
n/libnftnl
|
||||
n/libssh2
|
||||
n/libtirpc
|
||||
n/nftables
|
||||
n/rpcbind
|
||||
x/dri3proto
|
||||
x/libXaw3dXft
|
||||
x/libXpresent
|
||||
x/libepoxy
|
||||
x/libevdev
|
||||
x/libva
|
||||
x/libva-intel-driver
|
||||
x/libvdpau
|
||||
x/libxshmfence
|
||||
x/motif
|
||||
x/presentproto
|
||||
x/xcb-util-errors
|
||||
x/xf86-video-amdgpu
|
||||
xap/gparted
|
||||
xap/hexchat
|
||||
xap/pavucontrol
|
||||
xfce/xfce4-pulseaudio-plugin
|
||||
extra/fltk/fltk
|
||||
l/libmowgli
|
||||
l/libmcs
|
||||
l/libtermcap
|
||||
l/pyrex
|
||||
n/dirmngr
|
||||
n/idnkit
|
||||
n/pth
|
||||
n/rfkill (included in a/util-linux)
|
||||
n/sendmail (moved to /extra ; replaced by n/postfix and n/libmilter)
|
||||
n/sendmail-cf (moved to /extra ; replaced by n/postfix and n/libmilter)
|
||||
n/trn
|
||||
t/tetex (replaced by t/texlive)
|
||||
t/tetex-doc (replaced by t/texlive)
|
||||
x/libva-intel-driver (replaced by x/intel-vaapi-driver)
|
||||
x/libXfont
|
||||
x/xf86-video-xgi
|
||||
x/xf86-video-xgixp
|
||||
|
||||
|
||||
*** PACKAGE REMOVALS SINCE 14.1 ***
|
||||
*** NEW USERS/GROUPS SINCE 14.2 ***
|
||||
|
||||
a/cxxlibs (added to aaa_elflibs)
|
||||
a/procps (replaced by procps-ng)
|
||||
a/udev (replaced by eudev and libgudev)
|
||||
ap/foomatic-filters (included with cups-filters)
|
||||
d/open-cobol (replaced by gnu-cobol)
|
||||
kde/kdeadmin (split up into smaller packages)
|
||||
kde/kdenetwork (split up into smaller packages)
|
||||
kde/kdesdk (split up into smaller packages)
|
||||
kde/kdetoys (split up into smaller packages)
|
||||
kde/kwallet (replaced by kwalletmanager)
|
||||
kde/networkmanagement (split up into smaller packages)
|
||||
kde/oxygen-gtk3 (?)
|
||||
kdei/calligra-l10n-ia
|
||||
kdei/calligra-l10n-nds
|
||||
kdei/calligra-l10n-sl
|
||||
kdei/calligra-l10n-tr
|
||||
kdei/kde-l10n-si
|
||||
kdei/kde-l10n-tg
|
||||
kdei/kde-l10n-th
|
||||
kdei/kde-l10n-vi
|
||||
l/ConsoleKit (replaced by ConsoleKit2)
|
||||
n/bluez-hcidump (part of bluez package)
|
||||
l/gnome-icon-theme (replaced by adwaita-icon-theme)
|
||||
l/imlib (obsolete)
|
||||
l/lesstif (replaced by motif)
|
||||
l/libelf (replaced by elfutils)
|
||||
l/libjpeg (replaced by libjpeg-turbo)
|
||||
n/obex-data-server (replaced by obexd included with bluez)
|
||||
l/phonon-mplayer (unmaintained)
|
||||
l/phonon-xine (unmaintained)
|
||||
l/pil (replaced by python-pillow)
|
||||
n/obexfs (included in obexftp)
|
||||
n/portmap (replaced by libtirpc and rpcbind)
|
||||
x/xf86-input-aiptek (unmaintained)
|
||||
x/xf86-video-modesetting (part of xorg-server package)
|
||||
xap/xchat (replaced by hexchat)
|
||||
xfce/libxfcegui4 (obsolete)
|
||||
xfce/xfce4-mixer (replaced by xfce4-pulseaudio-plugin)
|
||||
xfce/xfce4-volumed (replaced by xfce4-pulseaudio-plugin)
|
||||
xfce/xfwm4-themes (unmaintained)
|
||||
|
||||
|
||||
*** NEW USERS/GROUPS SINCE 14.1 ***
|
||||
|
||||
input group, GID 71.
|
||||
sddm user/group, UID 64, GID 64.
|
||||
cgred group, GID 41
|
||||
ntp user and group, UID and GID 44
|
||||
postfix user and group, UID and GID 91
|
||||
postdrop user and group, UID and GID 92
|
||||
dovecot user and group, UID and GID 94
|
||||
dovenull user and group, UID and GID 95
|
||||
|
||||
|
||||
*** OTHER NOTABLE CHANGES AND HINTS ***
|
||||
|
||||
The stock networking scripts now use iproute2 instead of net-tools and
|
||||
bridge-utils and friends. All of the previous functionality is still
|
||||
supported with the same config file syntax in /etc/rc.d/rc.inet1.conf,
|
||||
but added functionality includes support for creating virtual interfaces
|
||||
(e.g. tun/tap) and adding them to bridges as well as binding additional
|
||||
IP addresses to virtual and/or real interfaces. This did involve some
|
||||
added options to rc.inet1.conf. Maybe best of all, /sbin/ifconfig can
|
||||
still be used to view (and even configure) interfaces manually - any
|
||||
additional IP addresses bound to interfaces using rc.inet1 will be done
|
||||
in such a way that /sbin/ifconfig recognizes them.
|
||||
|
||||
The ntp package has changed such that ntpd now drops privileges and runs as
|
||||
user ntp and group ntp. Be sure to move/merge the changes to rc.ntpd and
|
||||
/etc/ntp.conf.
|
||||
|
||||
The gnupg2 package has changed such that the gpg agent is autostarted on
|
||||
demand now, so be sure to remove any local profile script changes to
|
||||
handle that. Also, there is a new keyring format used by gnupg2-2.2.x,
|
||||
so have a look at https://www.gnupg.org/faq/whats-new-in-2.1.html#keybox
|
||||
for migration tips.
|
||||
|
||||
As mentioned earlier, n/postfix replaces n/sendmail as the default MTA.
|
||||
However, postfix is sendmail compatible with respect to function; in
|
||||
other words, any scripts or other applications expecting to *use*
|
||||
sendmail should work just fine, as postfix installs a file at
|
||||
/usr/sbin/sendmail. This is all fine and wonderful unless you want
|
||||
to *use* sendmail *instead* of postfix and thus decided to leave
|
||||
sendmail installed on the system. The postfix package will overwrite
|
||||
the /usr/sbin/sendmail file on the system. Long story short: if you
|
||||
plan to use the sendmail MTA instead of postfix, you will need to
|
||||
uninstall postfix *before* installing/reinstalling sendmail. You should
|
||||
never have both sendmail and postfix installed on the same machine.
|
||||
If you do, one of them will not work properly.
|
||||
|
||||
The cciss driver has been replaced by the hpsa driver, so if you're
|
||||
running an HP server, this may be relevant to you. This is mostly an
|
||||
issue with respect to device references -- if you have references to
|
||||
/dev/cciss/* in e.g. /etc/fstab and/or /etc/smartd.conf, you'll need
|
||||
to fix those. Reference: https://tinyurl.com/cciss-hpsa
|
||||
|
||||
Use one of the provided generic kernels for daily use. Do not report
|
||||
bugs until/unless you have reproduced them using one of the stock
|
||||
generic kernels. You will need to create an initrd in order to boot
|
||||
|
@ -216,7 +181,7 @@ Use one of the provided generic kernels for daily use. Do not report
|
|||
ATI proprietary drivers) if you use the SMP kernel.
|
||||
|
||||
If you decide to use one of the non-SMP kernels, you will need to follow the
|
||||
instructions in /extra/linux-4.4.14-nosmp-sdk/README.TXT to modify your
|
||||
instructions in /extra/linux-4.14.11-nosmp-sdk/README.TXT to modify your
|
||||
kernel sources for non-SMP usage. Note that this only applies if you are
|
||||
using the Slackware-provided non-SMP kernel - if you build a custom kernel,
|
||||
the symlinks at /lib/modules/$(uname -r)/{build,source} will point to the
|
||||
|
@ -230,54 +195,11 @@ Printing, scanning, and bluetooth usage require that your user account be a
|
|||
one or the other (depending on whether the group ownership was "lp" or
|
||||
"scanner").
|
||||
|
||||
Since pulseaudio is now included with Slackware, you'll almost surely want
|
||||
/etc/rc.d/rc.alsa to be mode 0644 (non-executable) since it no longer needs
|
||||
to be run on system boot.
|
||||
|
||||
Xorg no longer uses /etc/X11/xorg.conf by default (and in most cases, there
|
||||
is absolutely no need for it). You can still create an xorg.conf file if
|
||||
you wish, or you can create some minimal xorg.conf snippets with only the
|
||||
specific contents that you wish to override (as an example, to use a binary
|
||||
video driver) as separate files in the /etc/X11/xorg.conf.d/ directory.
|
||||
|
||||
/usr/share/X11/xorg.conf.d/ is the "packaged" configuration directory; all
|
||||
files ending with ".conf" in this directory are used by the X server
|
||||
unless there is an identically-named file in the local sysadmin directory.
|
||||
The local sysadmin config directory is /etc/X11/xorg.conf.d/ - all files
|
||||
ending with ".conf" in this directory are parsed.
|
||||
|
||||
There are several default config files in /usr/share/X11/xorg.conf.d/:
|
||||
* 10-evdev.conf
|
||||
a "catchall" file for input devices using the evdev driver; this
|
||||
should work for most hardware in the absence of a better driver
|
||||
* 10-quirks.conf
|
||||
a collection of quirks and blacklists/whitelists for known weirdos
|
||||
* 50-synaptics.conf
|
||||
overrides the earlier 10-evdev.conf file and uses the synaptics
|
||||
driver for all touchpads
|
||||
* 50-vmmouse.conf
|
||||
overrides for the earlier 10-evdev.conf file for vmmouse
|
||||
* 50-wacom.conf
|
||||
overrides the earlier 10-evdev.conf file and uses the wacom driver
|
||||
for Wacom tablets
|
||||
* 90-keyboard-layout.conf
|
||||
this sample ("normal" en layout) keeps the "old" default of
|
||||
allowing Zap'ing the Xserver.
|
||||
If you need to modify any of these defaults, then copy the relevant file
|
||||
from /usr/share/X11/xorg.conf.d/ to /etc/X11/xorg.conf.d/ and edit the
|
||||
copy.
|
||||
|
||||
Now that KMS (Kernel Mode Setting) for graphics cards has (mostly) stabilized,
|
||||
it is enabled by default for intel, ati, and nvidia graphics chipsets. It
|
||||
is possible to disable it use "nomodeset" as a kernel append in lilo.conf,
|
||||
but Xorg will not work at all on intel and ati chips (and maybe others) if
|
||||
you do that.
|
||||
|
||||
If you want to change the resolution of the KMS console, that can be done
|
||||
If you want to change the resolution of the KMS console, that can be done
|
||||
with something like this as a kernel append in lilo.conf:
|
||||
append="video=1024x768"
|
||||
|
||||
Speaking of lilo.conf and KMS, make sure you use either vga=normal or
|
||||
Speaking of lilo.conf and KMS, make sure you use either vga=normal or
|
||||
vga=extended -- some of the framebuffers don't like KMS very much...
|
||||
|
||||
If your cd/dvd drive is not visible inside a gtk-based desktop environment
|
||||
|
@ -308,10 +230,8 @@ If you have permission errors when attempting to burn a cdrom or dvd image,
|
|||
recommended by k3b), use it instead of 'cdrom' in the line above, and add
|
||||
to it only the users you wish to have access to cdrecord and cdrdao.
|
||||
|
||||
If you're installing on a virtual machine with QEMU/KVM using virtio disks,
|
||||
you will need the following line in /etc/lilo.conf to make it recognize
|
||||
the /dev/vda devices:
|
||||
disk=/dev/vda bios=0x80 max-partitions=7
|
||||
Subpixel hinting in freetype has been enabled upstream by default, but you
|
||||
may adjust this in /etc/profile.d/freetype.{csh,sh}.
|
||||
|
||||
Input methods for complex characters (CJK, which is shorthand for Chinese,
|
||||
Japanese, Korean) and other non-latin character sets have been added. These
|
||||
|
|
15908
ChangeLog.txt
15908
ChangeLog.txt
File diff suppressed because it is too large
Load diff
|
@ -9,13 +9,13 @@ set hidden_timeout_quiet=false
|
|||
|
||||
#terminal_output gfxterm
|
||||
|
||||
menuentry "Slackware 14.2 huge.s kernel"{
|
||||
menuentry "Slackware 15.0 huge.s kernel"{
|
||||
echo "Loading huge.s kernel and installer initrd. Please wait..."
|
||||
linux /kernels/huge.s/bzImage vga=normal load_ramdisk=1 prompt_ramdisk=0 ro printk.time=0 nomodeset SLACK_KERNEL=huge.s
|
||||
initrd /isolinux/initrd.img
|
||||
}
|
||||
|
||||
menuentry "Slackware 14.2 huge.s kernel (use KMS console)"{
|
||||
menuentry "Slackware 15.0 huge.s kernel (use KMS console)"{
|
||||
echo "Loading huge.s kernel (with KMS) and installer initrd. Please wait..."
|
||||
linux /kernels/huge.s/bzImage vga=normal load_ramdisk=1 prompt_ramdisk=0 ro printk.time=0 SLACK_KERNEL=huge.s
|
||||
initrd /isolinux/initrd.img
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -25,7 +25,7 @@
|
|||
# UEFI systems.
|
||||
|
||||
# First, build bootx64.efi, which will be installed here in /EFI/BOOT:
|
||||
grub-mkimage --format=x86_64-efi --output=bootx64.efi --config=grub-embedded.cfg --compression=xz --prefix=/EFI/BOOT part_gpt part_msdos fat ext2 hfs hfsplus iso9660 udf ufs1 ufs2 zfs chain linux boot appleldr ahci configfile normal regexp minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard
|
||||
grub-mkimage --format=x86_64-efi --output=bootx64.efi --config=grub-embedded.cfg --compression=xz --prefix=/EFI/BOOT part_gpt part_msdos fat ext2 hfs hfsplus iso9660 udf ufs1 ufs2 zfs chain linux boot appleldr configfile normal regexp minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard
|
||||
|
||||
# Then, create a FAT formatted image that contains bootx64.efi in the
|
||||
# /EFI/BOOT directory. This is used to bootstrap GRUB from the ISO image.
|
||||
|
|
15752
FILELIST.TXT
15752
FILELIST.TXT
File diff suppressed because it is too large
Load diff
|
@ -1,85 +1,85 @@
|
|||
|
||||
Slackware initrd mini HOWTO
|
||||
by Patrick Volkerding, volkerdi@slackware.com
|
||||
Fri Jun 24 13:32:40 CDT 2016
|
||||
Fri May 25 23:01:32 UTC 2018
|
||||
|
||||
This document describes how to create and install an initrd, which may be
|
||||
required to use the 4.x kernel. Also see "man mkinitrd".
|
||||
required to use the 4.x kernel. Also see "man mkinitrd".
|
||||
|
||||
1. What is an initrd?
|
||||
2. Why to I need an initrd?
|
||||
3. How do I build the initrd?
|
||||
4. Now that I've built an initrd, how do I use it?
|
||||
1. What is an initrd?
|
||||
2. Why to I need an initrd?
|
||||
3. How do I build the initrd?
|
||||
4. Now that I've built an initrd, how do I use it?
|
||||
|
||||
|
||||
1. What is an initrd?
|
||||
1. What is an initrd?
|
||||
|
||||
Initrd stands for "initial ramdisk". An initial ramdisk is a very small
|
||||
Initrd stands for "initial ramdisk". An initial ramdisk is a very small
|
||||
Linux filesystem that is loaded into RAM and mounted as the kernel boots,
|
||||
and before the main root filesystem is mounted.
|
||||
|
||||
2. Why do I need an initrd?
|
||||
2. Why do I need an initrd?
|
||||
|
||||
The usual reason to use an initrd is because you need to load kernel
|
||||
modules before mounting the root partition. Usually these modules are
|
||||
modules before mounting the root partition. Usually these modules are
|
||||
required to support the filesystem used by the root partition (ext3, ext4,
|
||||
btrfs, xfs), or perhaps the controller that the hard drive is attached
|
||||
to (SCSI, RAID, etc). Essentially, there are so many different options
|
||||
to (SCSI, RAID, etc). Essentially, there are so many different options
|
||||
available in modern Linux kernels that it isn't practical to try to ship
|
||||
many different kernels to try to cover everyone's needs. It's a lot more
|
||||
many different kernels to try to cover everyone's needs. It's a lot more
|
||||
flexible to ship a generic kernel and a set of kernel modules for it.
|
||||
|
||||
3. How do I build the initrd?
|
||||
3. How do I build the initrd?
|
||||
|
||||
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 4.4.14 Linux kernel using the packages
|
||||
in Slackware's mkinitrd package. We'll walk through the process of
|
||||
upgrading to the generic 4.14.44 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-4.4.14-x86_64-1.txz
|
||||
installpkg kernel-modules-4.4.14-x86_64-1.txz
|
||||
installpkg mkinitrd-1.4.8-x86_64-8.txz
|
||||
installpkg kernel-generic-4.14.44-x86_64-1.txz
|
||||
installpkg kernel-modules-4.14.44-x86_64-1.txz
|
||||
installpkg mkinitrd-1.4.11-x86_64-6.txz
|
||||
|
||||
Change into the /boot directory:
|
||||
|
||||
cd /boot
|
||||
|
||||
Now you'll want to run "mkinitrd". I'm using ext4 for my root filesystem,
|
||||
Now you'll want to run "mkinitrd". I'm using ext4 for my root filesystem,
|
||||
and since the disk controller requires no special support the ext4 module
|
||||
will be the only one I need to load:
|
||||
|
||||
mkinitrd -c -k 4.4.14 -m ext4
|
||||
mkinitrd -c -k 4.14.44 -m ext4
|
||||
|
||||
This should do two things. First, it will create a directory
|
||||
/boot/initrd-tree containing the initrd's filesystem. Then it will
|
||||
create an initrd (/boot/initrd.gz) from this tree. If you wanted to,
|
||||
This should do two things. First, it will create a directory
|
||||
/boot/initrd-tree containing the initrd's filesystem. Then it will
|
||||
create an initrd (/boot/initrd.gz) from this tree. If you wanted to,
|
||||
you could make some additional changes in /boot/initrd-tree/ and
|
||||
then run mkinitrd again without options to rebuild the image. That's
|
||||
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 4.4.14
|
||||
Here's another example: Build an initrd image using Linux 4.14.44
|
||||
kernel modules for a system with an ext4 root partition on /dev/sdb3:
|
||||
|
||||
mkinitrd -c -k 4.4.14 -m ext4 -f ext4 -r /dev/sdb3
|
||||
mkinitrd -c -k 4.14.44 -m ext4 -f ext4 -r /dev/sdb3
|
||||
|
||||
|
||||
4. Now that I've built an initrd, how do I use it?
|
||||
4. Now that I've built an initrd, how do I use it?
|
||||
|
||||
Now that you've got an initrd (/boot/initrd.gz), you'll want to load
|
||||
it along with the kernel at boot time. If you use LILO for your boot
|
||||
it along with the kernel at boot time. If you use LILO for your boot
|
||||
loader you'll need to edit /etc/lilo.conf and add a line to load the
|
||||
initrd. Here's an example section of lilo.conf showing how this is
|
||||
initrd. Here's an example section of lilo.conf showing how this is
|
||||
done:
|
||||
|
||||
# Linux bootable partition config begins
|
||||
image = /boot/vmlinuz-generic-4.4.14
|
||||
image = /boot/vmlinuz-generic
|
||||
initrd = /boot/initrd.gz
|
||||
root = /dev/sda6
|
||||
label = Lnx4414
|
||||
label = Slackware
|
||||
read-only
|
||||
# Linux bootable partition config ends
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ left unencrypted. This partition must contain the kernel(s) you want to boot
|
|||
from, and the initrd image that is needed with encrypted volumes. You need
|
||||
to install LILO either to the MBR - or if that is not possible, into the
|
||||
root sector of this small unencrypted partition. You will probably guess
|
||||
why we can not use an encrypted partition for this...
|
||||
why we cannot use an encrypted partition for this...
|
||||
|
||||
|
||||
Using cryptsetup during Slackware installation
|
||||
|
@ -140,10 +140,12 @@ an ordinary disk partition when we get to the TARGET selection in 'setup'. The
|
|||
mapped device nodes will be created in the directory '/dev/mapper'. The command
|
||||
will ask you for the passphrase which you entered during the "luksFormat"
|
||||
operation. The last argument that the command takes is the name of the mapped
|
||||
device. We will call our mapped device 'crypthome' (any name will do). It
|
||||
will be available for use as the block device '/dev/mapper/crypthome'.
|
||||
device. We will call our mapped device 'lukssdx2' (note that LUKS expects the
|
||||
mapped device name to be in the format of "luks<rawdevname>"). It will be
|
||||
available for use as the block device '/dev/mapper/lukssdx2', e.g. if the raw
|
||||
device name is "/dev/sda2", then the mapped name will be "/dev/mapper/lukssda2".
|
||||
|
||||
# cryptsetup luksOpen /dev/sdx2 crypthome
|
||||
# cryptsetup luksOpen /dev/sdx2 lukssdx2
|
||||
|
||||
* We've now finished our preparations, and it is time to start the 'setup'
|
||||
program and install Slackware. This setup does not differ at all from the
|
||||
|
@ -151,7 +153,7 @@ setup you have become used to. The only notable difference lies in the
|
|||
names of the devices you will select for your target partitions. Be sure
|
||||
to read until the end of the story though, because we will have to do some
|
||||
postprocessing in order to make your encrypted partitions available after
|
||||
reboot (setup can not yet do all of this automatically).
|
||||
reboot (setup cannot yet do all of this automatically).
|
||||
|
||||
* In setup, under "ADDSWAP", proceed as usual and configure a normal
|
||||
unencrypted swap partition, even if you want to have your swap encrypted.
|
||||
|
@ -160,8 +162,8 @@ finishes.
|
|||
|
||||
* In setup, when you choose "TARGET" in the main menu, you will notice that
|
||||
the mapped device is available in the 'Linux partition' selection as
|
||||
"/dev/mapper/crypthome". Select the partition you designated for your
|
||||
root ('/') filesystem, and next select "/dev/mapper/crypthome" for your
|
||||
"/dev/mapper/lukssdx2". Select the partition you designated for your
|
||||
root ('/') filesystem, and next select "/dev/mapper/lukssdx2" for your
|
||||
'/home' filesystem. Create any filesystem you like on them. My favorite
|
||||
fstype is ext4, but you can choose xfs or jfs for stability and speed.
|
||||
|
||||
|
@ -179,14 +181,14 @@ it to the correct device name. The file '/etc/crypttab' contains lines of the
|
|||
format: "mappedname devicename password options". Since we are still inside
|
||||
the installer, the root filesystem of our fresh Slackware installation is
|
||||
still mounted under '/mnt'. For our example where we encrypted '/dev/sdx2'
|
||||
and mapped the unlocked device to '/dev/mapper/crypthome', we need this
|
||||
and mapped the unlocked device to '/dev/mapper/lukssdx2', we need this
|
||||
single line in '/etc/crypttab':
|
||||
|
||||
crypthome /dev/sdx2
|
||||
lukssdx2 /dev/sdx2
|
||||
|
||||
So, we need to run the command:
|
||||
|
||||
# echo "crypthome /dev/sdx2" > /mnt/etc/crypttab
|
||||
# echo "lukssdx2 /dev/sdx2" > /mnt/etc/crypttab
|
||||
|
||||
in order to create the file with the required content (I am assuming here
|
||||
that the file did not yet exist... the above command will overwrite the
|
||||
|
@ -244,7 +246,7 @@ NOTE: the swap partition is encrypted with a new randomly generated key every
|
|||
There is no need to ever enter a passphrase!
|
||||
|
||||
NOTE: having an encrypted swap like this causes a re-format of the swap
|
||||
partition on avery boot-up and shutdown. This is perfectly OK as long
|
||||
partition on every boot-up and shutdown. This is perfectly OK as long
|
||||
as you do not change the order of your hard disks. If you add a disk,
|
||||
or move this disk to another computer, the device name may change (for
|
||||
instance from sda to sdb) and if you forget to modify '/etc/crypttab'
|
||||
|
@ -286,8 +288,8 @@ the /boot partition then.
|
|||
* Perform a Slackware install just like I described above, creating
|
||||
additional encrypted partitions and mapping them to appropriate names -
|
||||
for this example I assume that you map the encrypted root partition
|
||||
'/dev/sdx1' to 'cryptroot'. When the LILO configuration pops up, tell lilo
|
||||
that your root partition is '/dev/mapper/cryptroot'. Lilo will try to
|
||||
'/dev/sdx2' to 'lukssdx2'. When the LILO configuration pops up, tell lilo
|
||||
that your root partition is '/dev/mapper/lukssdx2'. Lilo will try to
|
||||
install and fail, and will tell you so. It will however have written a
|
||||
'lilo.conf' file which we can edit in a follow-up action. Proceed with
|
||||
the installation and at the end, exit the setup program but do _not_
|
||||
|
@ -311,7 +313,7 @@ image I assume that the root filesystem is 'ext4', we used the mapped device
|
|||
and are running the Slackware 14.2 default SMP kernel '4.4.14-smp'
|
||||
and we did not use Logical Volumes (more about that in the next section):
|
||||
|
||||
# mkinitrd -c -k 4.4.14-smp -m ext4 -f ext4 -r cryptroot -C /dev/sdx1
|
||||
# mkinitrd -c -k 4.4.14-smp -m ext4 -f ext4 -r lukssdx2 -C /dev/sdx2
|
||||
|
||||
* The resulting initrd image will be written to the file '/boot/initrd.gz'
|
||||
by default. We still need to tell lilo about this initrd. Open the
|
||||
|
@ -329,7 +331,7 @@ range of computers and that is why they are 'huge'. The linux part of
|
|||
|
||||
image = /boot/vmlinuz-generic-smp-4.4.14-smp
|
||||
initrd = /boot/initrd.gz
|
||||
root = /dev/mapper/cryptroot
|
||||
root = /dev/mapper/lukssdx2
|
||||
label = linux
|
||||
read-only
|
||||
|
||||
|
@ -337,17 +339,17 @@ If you add the above section as an extra instead of editing what's already
|
|||
present, make sure that the label you use ('linux' in the example above)
|
||||
is unique in the configuration file.
|
||||
|
||||
* If you have another OS on your computer and can not install lilo to the
|
||||
* If you have another OS on your computer and cannot install lilo to the
|
||||
MBR, you will have selected "Install to superblock (Root)" instead. In
|
||||
that case, we have one additional change to make, and that is almost at the
|
||||
top of the file. Look up the line that says "boot = /dev/mapper/cryptroot"
|
||||
top of the file. Look up the line that says "boot = /dev/mapper/lukssdx2"
|
||||
which is the device for your root partition and which was the reason for
|
||||
lilo failing to install. Change the boot device to the name of the small
|
||||
*unencrypted* partition you've created at the beginning and which is
|
||||
mounted under '/boot'. Assuming the name of that partition is '/dev/sdx4',
|
||||
mounted under '/boot'. Assuming the name of that partition is '/dev/sdx1',
|
||||
the "boot =" line must become like this:
|
||||
|
||||
boot = /dev/sdx4
|
||||
boot = /dev/sdx1
|
||||
|
||||
We are done. Write the changes, exit the editor and run the command 'lilo'.
|
||||
Lilo will issue a couple of warnings concerning a difference in what
|
||||
|
@ -378,7 +380,7 @@ passphrase to unlock and allows for hibernation (suspend-to-disk).
|
|||
|
||||
We are assuming that Slackware will be the only Operating System on your
|
||||
computer. In case you already have an OS installed (such as MS Windows), the
|
||||
procedure may be a little different because you can not always install lilo to
|
||||
procedure may be a little different because you cannot always install lilo to
|
||||
the MBR. After booting from the Slackware installation medium, we will
|
||||
create a small unencrypted partition that will contain the Linux kernels and
|
||||
the initrd image(s). The rest of the disk's free space will be dedicated to
|
||||
|
@ -409,26 +411,22 @@ default cipher is 'aes', with mode 'cbc-essiv:sha256' which is safe enough.
|
|||
which exposes the partition as an unencrypted block device. The command
|
||||
will ask you for the passphrase which you entered during the "luksFormat"
|
||||
operation. The last argument that the command takes is the name of the mapped
|
||||
device. We will call our mapped device 'slackluks' because I am not feeling
|
||||
original today. The mapped device which we will be using for unencrypted
|
||||
operations will therefore be '/dev/mapper/slackluks'. However, note that the
|
||||
installed system will name it 'lukssdx2' instead - it doesn't really matter
|
||||
what you call it right now, but it's worth knowing for potential later
|
||||
troubleshooting.
|
||||
device. We will call our mapped device 'lukssdx2' because the installed
|
||||
system will use that name (predictability is a good thing).
|
||||
|
||||
# cryptsetup luksOpen /dev/sdx2 slackluks
|
||||
# cryptsetup luksOpen /dev/sdx2 lukssdx2
|
||||
|
||||
* The LVM part is next. Create a Physical Volume (PV) on device
|
||||
'/dev/mapper/slackluks', a Volume Group (VG) called 'cryptvg' - any name will
|
||||
'/dev/mapper/lukssdx2', a Volume Group (VG) called 'cryptvg' - any name will
|
||||
do - on the PV, and three Logical Volumes (LV's) in the VG, one for your
|
||||
root partition (7 GB in size), one for the /home partition (10 GB in size)
|
||||
and a third which we will use for swap (1 GB in size). You will probably
|
||||
use different sizes depending on your environment and wishes, but keep the
|
||||
sum of the LV sizes less than the total size of the Physical Volume:
|
||||
|
||||
# pvcreate /dev/mapper/slackluks
|
||||
# pvcreate /dev/mapper/lukssdx2
|
||||
|
||||
# vgcreate cryptvg /dev/mapper/slackluks
|
||||
# vgcreate cryptvg /dev/mapper/lukssdx2
|
||||
|
||||
# lvcreate -L 7G -n root cryptvg
|
||||
|
||||
|
@ -660,6 +658,8 @@ Good luck with your fresh Slackware installion on encrypted partition(s)!
|
|||
==============================================================================
|
||||
Author:
|
||||
Eric Hameleers <alien@slackware.com> 18-sep-2012
|
||||
Edits by:
|
||||
Robby Workman <rworkman@slackware.com> 9 March 2017
|
||||
URLs:
|
||||
http://www.slackware.com/~alien/dokuwiki/doku.php?id=slackware:setup
|
||||
|
||||
|
|
7175
READ_DVD.TXT
7175
READ_DVD.TXT
File diff suppressed because it is too large
Load diff
|
@ -113,9 +113,8 @@ is that you know where the slackware packages directory is. We'll use
|
|||
fi
|
||||
done
|
||||
|
||||
You might also wish to move these config files over:
|
||||
You might also wish to move this config file over:
|
||||
|
||||
/usr/lib*/man.conf.new
|
||||
/usr/share/vim/vimrc.new
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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----------------------------------------------------|
|
||||
|
@ -15,5 +15,5 @@ google-chrome:
|
|||
google-chrome:
|
||||
google-chrome:
|
||||
google-chrome:
|
||||
google-chrome: Homepage: http://www.google.com/chrome
|
||||
google-chrome: Homepage: http://www.google.com/chrome
|
||||
google-chrome:
|
||||
|
|
31
extra/pure-alsa-system/README
Normal file
31
extra/pure-alsa-system/README
Normal file
|
@ -0,0 +1,31 @@
|
|||
# Don't like PulseAudio?
|
||||
# Fine, we're not going to force you to use it.
|
||||
#
|
||||
# To eliminate PulseAudio from your system and switch to using pure ALSA,
|
||||
# first remove the following packages:
|
||||
|
||||
removepkg pulseaudio pamixer pavucontrol xfce4-pulseaudio-plugin
|
||||
|
||||
# Next, install the packages in this directory:
|
||||
|
||||
upgradepkg --install-new *.txz
|
||||
|
||||
# Move the new asound.conf into place:
|
||||
|
||||
mv /etc/asound.conf.new /etc/asound.conf
|
||||
|
||||
# You may need to reboot at this point to make sure there are no running
|
||||
# PulseAudio processes, or any binaries still mapping the PulseAudio libraries.
|
||||
# If you use Xfce, you'll probably want to add the xfce4-mixer plugin (named
|
||||
# "audio mixer" in the menu) to the panel.
|
||||
#
|
||||
# If you run this README file as a script, it will do all of these things for
|
||||
# you except for adding the audio mixer to the Xfce panel:
|
||||
#
|
||||
# sh README
|
||||
#
|
||||
# Caveats:
|
||||
# Bluetooth audio will no longer work.
|
||||
# Third party packages that link to PulseAudio will need to be rebuilt.
|
||||
#
|
||||
# Enjoy! :-)
|
2
extra/sendmail/README
Normal file
2
extra/sendmail/README
Normal file
|
@ -0,0 +1,2 @@
|
|||
If you'd like to use sendmail rather than Postfix, be sure to remove the
|
||||
Postfix package before installing these, as there are overlapping files.
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2008, 2009, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2008, 2009, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -58,7 +58,11 @@ for file in aspell*bz2 ; do
|
|||
NAME=$(echo $NAME | sed 's/aspell5/aspell/' | sed 's/aspell6/aspell/')
|
||||
mkdir -p $PKG/usr/doc/${NAME}
|
||||
cp -a \
|
||||
README Copyright \
|
||||
README* Copyright* COPYING* \
|
||||
$PKG/usr/doc/${NAME}
|
||||
# Overwrite from doc/ is fine:
|
||||
cp -a \
|
||||
doc/* \
|
||||
$PKG/usr/doc/${NAME}
|
||||
chmod 644 $PKG/usr/doc/${NAME}/*
|
||||
mkdir $PKG/install
|
|
@ -22,9 +22,9 @@
|
|||
|
||||
# Slackware build script for bash-completion
|
||||
|
||||
VERSION=2.2
|
||||
VERSION=2.8
|
||||
ARCH=noarch
|
||||
BUILD=${BUILD:-3}
|
||||
BUILD=${BUILD:-1}
|
||||
|
||||
CWD=$(pwd)
|
||||
TMP=${TMP:-/tmp}
|
||||
|
@ -34,8 +34,8 @@ rm -rf $PKG
|
|||
mkdir -p $TMP $PKG
|
||||
cd $TMP
|
||||
rm -rf bash-completion-$VERSION
|
||||
tar xvf $CWD/bash-completion-$VERSION.tar.?z*
|
||||
cd bash-completion-$VERSION
|
||||
tar xvf $CWD/bash-completion-$VERSION.tar.?z || exit 1
|
||||
cd bash-completion-$VERSION || exit 1
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
|
@ -43,20 +43,14 @@ find . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \;
|
||||
|
||||
# Add some patches from git
|
||||
for file in $CWD/patches/*.patch.gz ; do
|
||||
zcat $file | patch -p1 --verbose || exit 1
|
||||
done
|
||||
|
||||
# Fixup sh completion for us
|
||||
zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
# Add some patches from git to fix tar filename completion and related
|
||||
# https://github.com/scop/bash-completion/issues/15
|
||||
zcat $CWD/patches/0001-tar-Don-t-write-to-tmp-jetel.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/0002-test-suite-Add-tar-xvf-filename-test-case.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/0003-tar-Fix-GNU-tar-help-output-parsing-regex-fixes-15.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/0004-tar-Remove-unused-variable.patch.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/patches/0005-tar-Detect-GNU-other-from-version-only-once-per-sess.patch.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
# Don't symlink mpv -> mplayer as it reportedly doesn't work well. Upstream patch.
|
||||
zcat $CWD/patches/0006-Remove-mplayer-aliased-completion.patch.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
autoreconf -vif
|
||||
|
||||
./configure \
|
||||
|
@ -69,6 +63,12 @@ autoreconf -vif
|
|||
make || exit 1
|
||||
make install DESTDIR=$PKG || exit 1
|
||||
|
||||
# Don't clobber mount and umount completions from util-linux:
|
||||
mv $PKG/usr/share/bash-completion/completions/mount \
|
||||
$PKG/usr/share/bash-completion/completions/_mount
|
||||
mv $PKG/usr/share/bash-completion/completions/umount \
|
||||
$PKG/usr/share/bash-completion/completions/_umount
|
||||
|
||||
# Create the local directory for admin changes/additions:
|
||||
mkdir -p $PKG/etc/bash_completion.d/
|
||||
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
From 6bdd92202f55d7c530dcbeb2a243604dac546cf1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Tue, 15 Mar 2016 19:49:55 +0200
|
||||
Subject: [PATCH 1/5] tar: Don't write to /tmp/jetel
|
||||
|
||||
---
|
||||
completions/tar | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/completions/tar b/completions/tar
|
||||
index ef18ad6..6e4c74c 100644
|
||||
--- a/completions/tar
|
||||
+++ b/completions/tar
|
||||
@@ -411,7 +411,7 @@ __tar_try_list_archive()
|
||||
shift
|
||||
|
||||
read tarball <<<"$(printf -- '%s\n' "$@" \
|
||||
- | command sed -n "/^.\{1,\}$regex\$/p" | tee /tmp/jetel)"
|
||||
+ | command sed -n "/^.\{1,\}$regex\$/p")"
|
||||
if [[ -n "$tarball" ]]; then
|
||||
local IFS=$'\n'
|
||||
COMPREPLY=($(compgen -o filenames -W "$(
|
||||
--
|
||||
2.7.2
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 807f903f86ad647425c83f7ad6fc499014c6734e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Tue, 15 Mar 2016 20:19:10 +0200
|
||||
Subject: [PATCH 2/5] test suite: Add tar xvf filename test case
|
||||
|
||||
---
|
||||
test/lib/completions/tar.exp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
|
||||
index 70e38d0..7cdef94 100644
|
||||
--- a/test/lib/completions/tar.exp
|
||||
+++ b/test/lib/completions/tar.exp
|
||||
@@ -59,6 +59,10 @@ set test "old option: create and members"
|
||||
assert_complete_dir "dir/ dir2/ archive.tar.xz escape.tar" "tar cTfvv NOT_EXISTS DONT_CREATE.tar " $::srcdir/fixtures/tar
|
||||
sync_after_int
|
||||
|
||||
+set test "old option: extract and archive"
|
||||
+assert_complete_dir "dir/ dir2/ archive.tar.xz escape.tar" "tar xvf " $::srcdir/fixtures/tar
|
||||
+sync_after_int
|
||||
+
|
||||
if { "$tar_version" == "gnu" } {
|
||||
set test "check short options"
|
||||
assert_complete_any "tar -c"
|
||||
--
|
||||
2.7.2
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 0b7189d4eee4597e11cab02e6b4dcae488db5ca8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Wed, 16 Mar 2016 12:28:29 +0200
|
||||
Subject: [PATCH 3/5] tar: Fix GNU tar help output parsing regex, fixes #15
|
||||
|
||||
---
|
||||
completions/tar | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/completions/tar b/completions/tar
|
||||
index 6e4c74c..0a5f588 100644
|
||||
--- a/completions/tar
|
||||
+++ b/completions/tar
|
||||
@@ -105,7 +105,7 @@ __gnu_tar_parse_help()
|
||||
# or more options separated by ', ' separator string. We are matching
|
||||
# like this then: ^<spaces>(<separator>?<option>)+<whatever>$
|
||||
if [[ "$line" =~ \
|
||||
- ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?-=]+))(,[[:space:]])?)+).*$ ]]; then
|
||||
+ ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
|
||||
|
||||
line=${BASH_REMATCH[1]}
|
||||
str="${line//,/ }"
|
||||
--
|
||||
2.7.2
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 7ab05bf9d97ce5a6ced7acdfc21235e06542c3f2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Wed, 16 Mar 2016 12:39:06 +0200
|
||||
Subject: [PATCH 4/5] tar: Remove unused variable
|
||||
|
||||
---
|
||||
completions/tar | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/completions/tar b/completions/tar
|
||||
index 0a5f588..9c44dc7 100644
|
||||
--- a/completions/tar
|
||||
+++ b/completions/tar
|
||||
@@ -696,7 +696,7 @@ _posix_tar()
|
||||
|
||||
_tar()
|
||||
{
|
||||
- local cmd=${COMP_WORDS[0]} output line
|
||||
+ local cmd=${COMP_WORDS[0]} line
|
||||
read line <<<"$($cmd --version)"
|
||||
case "$line" in
|
||||
*GNU*)
|
||||
--
|
||||
2.7.2
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 88c671a2c74bfde3bc2ec7c6f74133ac613c61da Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Wed, 16 Mar 2016 12:44:40 +0200
|
||||
Subject: [PATCH 5/5] tar: Detect GNU/other from --version only once per
|
||||
session
|
||||
|
||||
---
|
||||
completions/tar | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/completions/tar b/completions/tar
|
||||
index 9c44dc7..7b3a486 100644
|
||||
--- a/completions/tar
|
||||
+++ b/completions/tar
|
||||
@@ -696,16 +696,25 @@ _posix_tar()
|
||||
|
||||
_tar()
|
||||
{
|
||||
- local cmd=${COMP_WORDS[0]} line
|
||||
+ local cmd=${COMP_WORDS[0]} func line
|
||||
read line <<<"$($cmd --version)"
|
||||
case "$line" in
|
||||
*GNU*)
|
||||
- _gtar "$@"
|
||||
+ func=_gtar
|
||||
;;
|
||||
*)
|
||||
- _posix_tar "$@"
|
||||
+ func=_posix_tar
|
||||
;;
|
||||
esac
|
||||
+ $func "$@"
|
||||
+
|
||||
+ # Install real completion for subsequent completions
|
||||
+ if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
|
||||
+ complete -F $func -o dirnames tar
|
||||
+ else
|
||||
+ complete -F $func tar
|
||||
+ fi
|
||||
+ unset -f _tar
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.7.2
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- ./completions/Makefile.in.orig 2016-03-03 06:12:35.000000000 -0600
|
||||
+++ ./completions/Makefile.in 2016-05-31 14:01:42.323415707 -0500
|
||||
@@ -1236,7 +1236,7 @@
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mcrypt $(targetdir)/$$file ; \
|
||||
done
|
||||
- for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
|
||||
+ for file in mplayer2 mencoder gmplayer kplayer ; do \
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mplayer $(targetdir)/$$file ; \
|
||||
done
|
||||
--- ./completions/Makefile.am.orig 2016-03-02 13:42:58.000000000 -0600
|
||||
+++ ./completions/Makefile.am 2016-05-31 14:01:33.554416246 -0500
|
||||
@@ -802,7 +802,7 @@
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mcrypt $(targetdir)/$$file ; \
|
||||
done
|
||||
- for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
|
||||
+ for file in mplayer2 mencoder gmplayer kplayer ; do \
|
||||
rm -f $(targetdir)/$$file && \
|
||||
$(LN_S) mplayer $(targetdir)/$$file ; \
|
||||
done
|
|
@ -1,19 +1,19 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
bash-completion: bash-completion (programmable completion for the bash shell)
|
||||
bash-completion:
|
||||
bash-completion: Adds programmable completion to the bash shell. A new file called
|
||||
bash-completion: Adds programmable completion to the bash shell. A new file called
|
||||
bash-completion: /etc/profile.d/bash_completion.sh will be sourced for interactive
|
||||
bash-completion: bash shells adding all sorts of enhanced command completion features.
|
||||
bash-completion: Once installed, you may get a list of all commands that have
|
||||
bash-completion: associated completions with 'complete -p', and examine the code for
|
||||
bash-completion: the shell functions with 'declare -f'.
|
||||
bash-completion:
|
||||
bash-completion: Homepage: https://alioth.debian.org/projects/bash-completion/
|
||||
bash-completion: Homepage: https://github.com/scop/bash-completion
|
||||
bash-completion:
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
|
@ -10,10 +10,10 @@ bittorrent: bittorrent (BitTorrent file distribution utility)
|
|||
bittorrent:
|
||||
bittorrent: BitTorrent is a file distribution utility which utilizes the upload
|
||||
bittorrent: capacity of machines which are downloading a file to help distribute
|
||||
bittorrent: it to other downloading machines. This makes it possible to provide
|
||||
bittorrent: it to other downloading machines. This makes it possible to provide
|
||||
bittorrent: large files (such as the Slackware Linux ISO images) to many people
|
||||
bittorrent: without the usual problem of insufficient bandwidth. The more
|
||||
bittorrent: downloaders, the more bandwidth. Problem solved.
|
||||
bittorrent: without the usual problem of insufficient bandwidth. The more
|
||||
bittorrent: downloaders, the more bandwidth. Problem solved.
|
||||
bittorrent:
|
||||
bittorrent: Bram Cohen is the genius behind BitTorrent.
|
||||
bittorrent:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright 2010, 2012, 2013, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2010, 2012, 2013, 2016, 2017, 2018 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.
|
||||
|
||||
# Set initial variables:
|
||||
CWD=`pwd`
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
if [ "$TMP" = "" ]; then
|
||||
TMP=/tmp
|
||||
fi
|
||||
|
@ -31,8 +31,8 @@ fi
|
|||
PKG=/tmp/package-brltty
|
||||
|
||||
PKGNAM=brltty
|
||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-2}
|
||||
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
|
||||
|
@ -44,6 +44,14 @@ if [ -z "$ARCH" ]; then
|
|||
esac
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$ARCH" = "x86_64" ]; then
|
||||
LIBDIRSUFFIX="64"
|
||||
else
|
||||
|
@ -56,11 +64,10 @@ rm -rf $PKG
|
|||
mkdir -p $PKG
|
||||
cd $TMP
|
||||
rm -rf brltty-$VERSION
|
||||
tar xvf $CWD/brltty-$VERSION.tar.?z* || exit 1
|
||||
cd brltty-$VERSION
|
||||
tar xvf $CWD/brltty-$VERSION.tar.?z || exit 1
|
||||
cd brltty-$VERSION || exit 1
|
||||
|
||||
zcat $CWD/brltty.brlapi.pyx.diff.gz | patch -p1 --verbose || exit 1
|
||||
zcat $CWD/brltty.fix.blanks.diff.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
sh autogen
|
||||
|
||||
|
@ -89,7 +96,7 @@ chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/*
|
|||
|
||||
# Add udev rules:
|
||||
mkdir -p $PKG/lib/udev/rules.d
|
||||
cp Autostart/Udev/udev.rules $PKG/lib/udev/rules.d/40-usb-brltty.rules
|
||||
cp Autostart/Udev/rules $PKG/lib/udev/rules.d/40-usb-brltty.rules || exit 1
|
||||
|
||||
( cd $PKG
|
||||
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
From 74171852c8c11ebd4725e93cfac6a19906821272 Mon Sep 17 00:00:00 2001
|
||||
From: Dave Mielke <dave@mielke.cc>
|
||||
Date: Mon, 8 Feb 2016 22:06:45 -0500
|
||||
Subject: [PATCH] The Linux screen driver should prefer a blank [U+0020] if the
|
||||
same glyph is also used for other characters. (dm)
|
||||
|
||||
---
|
||||
Drivers/Screen/Linux/screen.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c
|
||||
index bb5e273..bc2f2c4 100644
|
||||
--- a/Drivers/Screen/Linux/screen.c
|
||||
+++ b/Drivers/Screen/Linux/screen.c
|
||||
@@ -912,7 +912,9 @@ setTranslationTable (int force) {
|
||||
const struct unipair *sfm = &screenFontMapTable[--screenFontMapIndex];
|
||||
|
||||
if (sfm->fontpos < count) {
|
||||
- translationTable[sfm->fontpos] = sfm->unicode;
|
||||
+ wchar_t *character = &translationTable[sfm->fontpos];
|
||||
+ if (*character == 0X20) continue;
|
||||
+ *character = sfm->unicode;
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.1.1.1.g1fb337f
|
|
@ -1,18 +1,18 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
brltty: brltty (Braille display daemon)
|
||||
brltty:
|
||||
brltty: BRLTTY is a daemon which provides access to the Linux console (text
|
||||
brltty: mode) for a blind person using a soft braille display. It drives the
|
||||
brltty: mode) for a blind person using a soft braille display. It drives the
|
||||
brltty: braille terminal and provides complete screen review functionality.
|
||||
brltty:
|
||||
brltty: Homepage: http://mielke.cc/brltty/
|
||||
brltty: Homepage: http://mielke.cc/brltty/
|
||||
brltty:
|
||||
brltty:
|
||||
brltty:
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
emacspeak: emacspeak (Emacs speech interface)
|
||||
emacspeak:
|
||||
emacspeak: Emacspeak is a speech interface that allows visually impaired users to
|
||||
emacspeak: interact independently and efficiently with the computer. By
|
||||
emacspeak: interact independently and efficiently with the computer. By
|
||||
emacspeak: seamlessly blending all aspects of the Internet such as Web-surfing
|
||||
emacspeak: and messaging, Emacspeak speech-enables local and remote information
|
||||
emacspeak: via a consistent and well-integrated user interface. Emacspeak has
|
||||
emacspeak: via a consistent and well-integrated user interface. Emacspeak has
|
||||
emacspeak: dramatically changed how the author, T. V. Raman, and hundreds of
|
||||
emacspeak: blind and visually impaired users around the world interact with the
|
||||
emacspeak: personal computer and the Internet.
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
PRGNAM=flashplayer-plugin
|
||||
# Determine the latest version by checking the web page:
|
||||
VERSION=${VERSION:-"$(wget -O - http://www.adobe.com/software/flash/about/ 2>/dev/null | sed -n "/Firefox - NPAPI/{N;p}" | tr -d ' '| tail -1 | tr '<>' ' ' | cut -f3 -d ' ')"}
|
||||
VERSION=${VERSION:-"$(wget -O - http://www.adobe.com/software/flash/about/ 2>/dev/null | grep -2 "Firefox - NPAPI" | tail -1 | cut -f 2 -d '>' | cut -f 1 -d '<')"}
|
||||
MAJVER=$(echo $VERSION | cut -d. -f1)
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-}
|
||||
|
@ -71,8 +71,8 @@ case "$MARCH" in
|
|||
;;
|
||||
esac
|
||||
|
||||
SOURCE="$SRCDIR/install_flash_player_${VERSION}_linux_${ARCH}.tar.gz"
|
||||
SRCURL="http://fpdownload.macromedia.com/get/flashplayer/pdc/${VERSION}/install_flash_player_${MAJVER}_linux.${ARCH}.tar.gz"
|
||||
SOURCE="$SRCDIR/flash_player_npapi_linux.${VERSION}.${ARCH}.tar.gz"
|
||||
SRCURL="http://fpdownload.macromedia.com/get/flashplayer/pdc/${VERSION}/flash_player_npapi_linux.${ARCH}.tar.gz"
|
||||
|
||||
##
|
||||
## --- with a little luck, you won't have to edit below this point --- ##
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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-----------------------------------------|
|
||||
|
@ -12,8 +12,8 @@ flashplayer-plugin: Provides Adobe Flash plugin for browsers that recognize
|
|||
flashplayer-plugin: /usr/lib/mozilla/plugins as a valid plugin directory
|
||||
flashplayer-plugin:
|
||||
flashplayer-plugin: Plugin is subject to Adobe terms of use:
|
||||
flashplayer-plugin: http://www.adobe.com/go/labs_term_of_use
|
||||
flashplayer-plugin: http://www.adobe.com/go/labs_term_of_use
|
||||
flashplayer-plugin:
|
||||
flashplayer-plugin: Plugin is subject to Adobe Flash EULA:
|
||||
flashplayer-plugin: http://labs.adobe.com/technologies/eula/flashplayer.html
|
||||
flashplayer-plugin: http://labs.adobe.com/technologies/eula/flashplayer.html
|
||||
flashplayer-plugin:
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
Index: src/fl_font.cxx
|
||||
===================================================================
|
||||
--- src/fl_font.cxx (revision 10503)
|
||||
+++ src/fl_font.cxx (revision 10504)
|
||||
@@ -55,6 +55,12 @@
|
||||
# include "fl_font_x.cxx"
|
||||
#endif // WIN32
|
||||
|
||||
+#if ! (defined(WIN32) || defined(__APPLE__))
|
||||
+XFontStruct *fl_X_core_font()
|
||||
+{
|
||||
+ return fl_xfont.value();
|
||||
+}
|
||||
+#endif
|
||||
|
||||
double fl_width(const char* c) {
|
||||
if (c) return fl_width(c, (int) strlen(c));
|
||||
Index: src/gl_draw.cxx
|
||||
===================================================================
|
||||
--- src/gl_draw.cxx (revision 10503)
|
||||
+++ src/gl_draw.cxx (revision 10504)
|
||||
@@ -81,7 +81,7 @@
|
||||
* then sorting through them at draw time (for normal X rendering) to find which one can
|
||||
* render the current glyph... But for now, just use the first font in the list for GL...
|
||||
*/
|
||||
- XFontStruct *font = fl_xfont;
|
||||
+ XFontStruct *font = fl_X_core_font();
|
||||
int base = font->min_char_or_byte2;
|
||||
int count = font->max_char_or_byte2-base+1;
|
||||
fl_fontsize->listbase = glGenLists(256);
|
||||
Index: FL/x.H
|
||||
===================================================================
|
||||
--- FL/x.H (revision 10503)
|
||||
+++ FL/x.H (revision 10504)
|
||||
@@ -132,6 +132,7 @@
|
||||
XFontStruct *ptr;
|
||||
};
|
||||
extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
|
||||
+extern FL_EXPORT XFontStruct* fl_X_core_font();
|
||||
|
||||
// this object contains all X-specific stuff about a window:
|
||||
// Warning: this object is highly subject to change!
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -20,9 +20,10 @@
|
|||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=fltk
|
||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
|
||||
VERSION=$(basename $(echo $PKGNAM-*.tar.lz | cut -f 2- -d -) -source.tar.lz)
|
||||
BUILD=${BUILD:-2}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
|
@ -36,6 +37,14 @@ if [ -z "$ARCH" ]; then
|
|||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j7 "}
|
||||
|
||||
if [ "$ARCH" = "i386" ]; then
|
||||
|
@ -64,7 +73,6 @@ else
|
|||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
CWD=$(pwd)
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
|
@ -73,10 +81,10 @@ mkdir -p $TMP $PKG
|
|||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-${VERSION}-source.tar.?z* || exit 1
|
||||
tar xvf $CWD/$PKGNAM-${VERSION}-source.tar.lz || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
zcat $CWD/Fl_XFont_On_Demand.patch.gz | patch -p0 --verbose || exit 1
|
||||
zcat $CWD/fltk.fltk-config.in.diff.gz | patch -p1 --verbose || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
|
@ -152,5 +160,5 @@ 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
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
|
||||
|
||||
|
|
98
extra/source/fltk/fltk.fltk-config.in.diff
Normal file
98
extra/source/fltk/fltk.fltk-config.in.diff
Normal file
|
@ -0,0 +1,98 @@
|
|||
diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
|
||||
--- fltk-1.3.3-orig/fltk-config.in 2014-12-31 15:43:07.203519633 -0500
|
||||
+++ fltk-1.3.3/fltk-config.in 2014-12-31 15:49:01.636277725 -0500
|
||||
@@ -54,21 +54,6 @@
|
||||
bindir="$selfdir/fluid"
|
||||
includedir="$selfdir"
|
||||
libdir="$selfdir/lib"
|
||||
-
|
||||
- if test -f "$libdir/libfltk_jpeg.a"; then
|
||||
- CFLAGS="-I$includedir/jpeg $CFLAGS"
|
||||
- CXXFLAGS="-I$includedir/jpeg $CXXFLAGS"
|
||||
- fi
|
||||
-
|
||||
- if test -f "$libdir/libfltk_z.a"; then
|
||||
- CFLAGS="-I$includedir/zlib $CFLAGS"
|
||||
- CXXFLAGS="-I$includedir/zlib $CXXFLAGS"
|
||||
- fi
|
||||
-
|
||||
- if test -f "$libdir/libfltk_png.a"; then
|
||||
- CFLAGS="-I$includedir/png $CFLAGS"
|
||||
- CXXFLAGS="-I$includedir/png $CXXFLAGS"
|
||||
- fi
|
||||
fi
|
||||
|
||||
if test -d $includedir/FL/images; then
|
||||
@@ -76,11 +61,6 @@
|
||||
CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
|
||||
fi
|
||||
|
||||
-if test -f "$libdir/libfltk_cairo.a"; then
|
||||
- CFLAGS="$CAIROFLAGS $CFLAGS"
|
||||
- CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
|
||||
-fi
|
||||
-
|
||||
# libraries to link with:
|
||||
LIBNAME="@LIBNAME@"
|
||||
DSONAME="@DSONAME@"
|
||||
@@ -230,25 +210,20 @@
|
||||
fi
|
||||
|
||||
# Calculate needed libraries
|
||||
-LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
||||
LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
||||
|
||||
if test x$use_forms = xyes; then
|
||||
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
||||
- LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
||||
fi
|
||||
if test x$use_gl = xyes; then
|
||||
LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
||||
- LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
||||
fi
|
||||
if test x$use_images = xyes; then
|
||||
LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
||||
- LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
if test x$use_cairo = xyes; then
|
||||
LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
||||
- LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
||||
@@ -359,26 +334,26 @@
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- USELIBS="$libdir/libfltk.a"
|
||||
+ USELIBS="$libdir/libfltk.so"
|
||||
|
||||
if test x$use_forms = xyes; then
|
||||
- USELIBS="$libdir/libfltk_forms.a $USELIBS"
|
||||
+ USELIBS="$libdir/libfltk_forms.so $USELIBS"
|
||||
fi
|
||||
|
||||
if test x$use_gl = xyes; then
|
||||
- USELIBS="$libdir/libfltk_gl.a $USELIBS"
|
||||
+ USELIBS="$libdir/libfltk_gl.so $USELIBS"
|
||||
fi
|
||||
|
||||
if test x$use_cairo = xyes; then
|
||||
- USELIBS="$libdir/libfltk_cairo.a $USELIBS"
|
||||
+ USELIBS="$libdir/libfltk_cairo.so $USELIBS"
|
||||
fi
|
||||
|
||||
if test x$use_images = xyes; then
|
||||
- USELIBS="$libdir/libfltk_images.a $USELIBS"
|
||||
+ USELIBS="$libdir/libfltk_images.so $USELIBS"
|
||||
|
||||
for lib in fltk_jpeg fltk_png fltk_z; do
|
||||
- if test -f $libdir/lib$lib.a; then
|
||||
- USELIBS="$libdir/lib$lib.a $USELIBS"
|
||||
+ if test -f $libdir/lib$lib.so; then
|
||||
+ USELIBS="$libdir/lib$lib.so $USELIBS"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
|
@ -10,9 +10,9 @@ fltk: fltk (The Fast Light Tool Kit)
|
|||
fltk:
|
||||
fltk: The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a a cross-
|
||||
fltk: platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11), Microsoft(r)
|
||||
fltk: Windows(r), and MacOS(r) X. FLTK provides modern GUI functionality
|
||||
fltk: Windows(r), and MacOS(r) X. FLTK provides modern GUI functionality
|
||||
fltk: without the bloat and supports 3D graphics via OpenGL(r) and its
|
||||
fltk: built-in GLUT emulation. The Fast Light Tool Kit was originally
|
||||
fltk: built-in GLUT emulation. The Fast Light Tool Kit was originally
|
||||
fltk: developed by Mr. Bill Spitzak.
|
||||
fltk:
|
||||
fltk: fltk home: http://www.fltk.org
|
||||
|
|
|
@ -1,26 +1,21 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# All rights reserved.
|
||||
# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
# permitted provided that the following conditions are met:
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# 1. Redistributions of this script must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 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.
|
||||
#
|
||||
# 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.
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
CWD=$(pwd)
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-java
|
||||
rm -rf $PKG
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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------------------------------------------------------|
|
||||
jdk: Java(TM) 2 Platform Standard Edition Development Kit.
|
||||
jdk:
|
||||
jdk: The Java 2 SDK software includes tools for developing, testing, and
|
||||
jdk: running programs written in the Java programming language. This
|
||||
jdk: running programs written in the Java programming language. This
|
||||
jdk: package contains everything you need to run Java(TM).
|
||||
jdk:
|
||||
jdk: For additional information, refer to this web page:
|
||||
jdk: http://java.com/
|
||||
jdk: http://java.com/
|
||||
jdk:
|
||||
jdk:
|
||||
jdk:
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# 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
|
||||
# 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.
|
||||
|
|
|
@ -1,247 +0,0 @@
|
|||
#!/bin/sh
|
||||
# $Id: mplayerplug-in.SlackBuild,v 1.3 2008/08/08 11:36:29 root Exp root $
|
||||
# Copyright (c) 2006-2008 Eric Hameleers <alien@slackware.com>, 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
#
|
||||
# Slackware SlackBuild script
|
||||
# ===========================
|
||||
# By: Eric Hameleers <alien@slackware.com>
|
||||
# For: mplayerplug-in
|
||||
# Descr: embedded video player for mozilla based browsers
|
||||
# URL: http://mplayerplug-in.sourceforge.net/
|
||||
# Needs: MPlayer >= 1.0rc2
|
||||
# Changelog:
|
||||
# 3.31-1: 05/Nov/2006 by Eric Hameleers <alien@slackware.com>
|
||||
# * Initial build.
|
||||
# 3.55-1: 08/Aug/2008 by Eric Hameleers <alien@slackware.com>
|
||||
# * Update.
|
||||
#
|
||||
# Run 'sh mplayerplug-in.SlackBuild --cleanup' to build a Slackware package.
|
||||
# The package (.txz) plus descriptive .txt file are created in /tmp .
|
||||
# Install using 'installpkg'.
|
||||
#
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Set initial variables:
|
||||
|
||||
PRGNAM=mplayerplug-in
|
||||
VERSION=${VERSION:-3.55}
|
||||
ARCH=${ARCH:-x86_64}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-}
|
||||
|
||||
DOCS="ChangeLog INSTALL LICENSE README TODO"
|
||||
|
||||
# Where do we look for sources?
|
||||
SRCDIR=$(cd $(dirname $0); pwd)
|
||||
|
||||
# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
|
||||
TMP=${TMP:-/tmp/build}
|
||||
PKG=$TMP/package-$PRGNAM
|
||||
OUTPUT=${OUTPUT:-/tmp}
|
||||
|
||||
SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
|
||||
SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
|
||||
|
||||
##
|
||||
## --- with a little luck, you won't have to edit below this point --- ##
|
||||
##
|
||||
|
||||
# Exit the script on errors:
|
||||
set -e
|
||||
trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
|
||||
# Catch unitialized variables:
|
||||
set -u
|
||||
P1=${1:-1}
|
||||
|
||||
# Slackware 11 and up need other option (gcc > 3.3.x)
|
||||
if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -gt 33 ]; then
|
||||
MOPT=tune
|
||||
else
|
||||
MOPT=cpu
|
||||
fi
|
||||
|
||||
case "$ARCH" in
|
||||
i486) SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
|
||||
SLKLDFLAGS=""; LIBDIRSUFFIX=""
|
||||
;;
|
||||
s390) SLKCFLAGS="-O2"
|
||||
SLKLDFLAGS=""; LIBDIRSUFFIX=""
|
||||
;;
|
||||
powerpc) SLKCFLAGS="-O2"
|
||||
SLKLDFLAGS=""; LIBDIRSUFFIX=""
|
||||
;;
|
||||
x86_64) SLKCFLAGS="-O2 -fPIC"
|
||||
SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
|
||||
;;
|
||||
athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
|
||||
SLKLDFLAGS=""; LIBDIRSUFFIX=""
|
||||
;;
|
||||
esac
|
||||
|
||||
# Create working directories:
|
||||
mkdir -p $OUTPUT # place for the package to be saved
|
||||
mkdir -p $TMP/tmp-$PRGNAM # location to build the source
|
||||
mkdir -p $PKG # place for the package to be built
|
||||
rm -rf $PKG/* # always erase old package's contents
|
||||
rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
|
||||
|
||||
# Source file availability:
|
||||
if ! [ -f ${SOURCE} ]; then
|
||||
if ! [ "x${SRCURL}" == "x" ]; then
|
||||
# Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
|
||||
[ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
|
||||
echo "Source '$(basename ${SOURCE})' not available yet..."
|
||||
echo "Will download file to $(dirname $SOURCE)"
|
||||
wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
|
||||
if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
|
||||
echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
|
||||
mv -f "${SOURCE}" "${SOURCE}".FAIL
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "File '$(basename ${SOURCE})' not available... aborting the build."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$P1" == "--download" ]; then
|
||||
echo "Download complete."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# --- PACKAGE BUILDING ---
|
||||
|
||||
echo "++"
|
||||
echo "|| $PRGNAM-$VERSION"
|
||||
echo "++"
|
||||
|
||||
cd $TMP/tmp-$PRGNAM
|
||||
echo "Extracting the source archive(s) for $PRGNAM..."
|
||||
if $(file ${SOURCE} | grep -q ": bzip2"); then
|
||||
tar -xjvf ${SOURCE}
|
||||
elif $(file ${SOURCE} | grep -q ": gzip"); then
|
||||
tar -xzvf ${SOURCE}
|
||||
fi
|
||||
cd ${PRGNAM}-${VERSION}
|
||||
chown -R root:root .
|
||||
chmod -R u+w,go+r-w,a-s .
|
||||
|
||||
echo Building ...
|
||||
LDFLAGS="$SLKLDFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
./configure --prefix=/usr \
|
||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
||||
--localstatedir=/var \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/man \
|
||||
--enable-wmp \
|
||||
--enable-qt \
|
||||
--enable-rm \
|
||||
--enable-gmp \
|
||||
--enable-dvx \
|
||||
--program-prefix="" \
|
||||
--program-suffix="" \
|
||||
--build=$ARCH-slackware-linux \
|
||||
2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
|
||||
make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
|
||||
|
||||
# Install all the needed stuff to the package dir
|
||||
# Use installwatch if available, to produce a logfile of the installation
|
||||
# process that is more easily readable:
|
||||
if $(which installwatch > /dev/null 2>&1); then
|
||||
installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
|
||||
else
|
||||
make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
|
||||
fi
|
||||
|
||||
# Prepare the config files:
|
||||
mv $PKG/etc/mplayerplug-in.conf{,.new}
|
||||
mv $PKG/etc/mplayerplug-in.types{,.new}
|
||||
|
||||
# Add this to the doinst.sh
|
||||
! [ -d $PKG/install ] && mkdir -p $PKG/install
|
||||
cat <<EOINS >> $PKG/install/doinst.sh
|
||||
# Handle the incoming configuration files:
|
||||
config() {
|
||||
for infile in \$1; do
|
||||
NEW="\$infile"
|
||||
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...
|
||||
done
|
||||
}
|
||||
|
||||
config etc/mplayerplug-in.conf.new
|
||||
config etc/mplayerplug-in.types.new
|
||||
|
||||
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
|
||||
chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
find $PKG/usr/doc -type f -exec chmod 644 {} \;
|
||||
|
||||
# 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:
|
||||
cd $PKG
|
||||
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||
cd -
|
||||
|
||||
# Add a package description:
|
||||
mkdir -p $PKG/install
|
||||
cat $SRCDIR/slack-desc > $PKG/install/slack-desc
|
||||
if [ -f $SRCDIR/doinst.sh ]; then
|
||||
cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
|
||||
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
|
||||
cd $OUTPUT
|
||||
md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
|
||||
cd -
|
||||
cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
|
||||
if [ -f $PKG/install/slack-required ]; then
|
||||
cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
|
||||
fi
|
||||
|
||||
# Clean up the extra stuff:
|
||||
if [ "$P1" = "--cleanup" ]; then
|
||||
rm -rf $TMP/tmp-$PRGNAM
|
||||
rm -rf $PKG
|
||||
fi
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue