Browse Source

Removed trailing spaces from scripts/ lib/ etc/ doc/, without renewing the copyright note

karasz/new-early
Alejandro Mery 17 years ago
parent
commit
cd1a940f7e
142 changed files with 729 additions and 729 deletions
  1. +2
    -2
      doc/HISTORY
  2. +2
    -2
      doc/LIB64-UGLY-HACKED-PACKAGES
  3. +1
    -1
      doc/PKG-BUILD-VARS
  4. +1
    -1
      doc/files/LICENSE-WARNING
  5. +1
    -1
      doc/old/CHANGELOG-1999
  6. +3
    -3
      doc/old/CHANGELOG-2000
  7. +1
    -1
      doc/old/CHANGELOG-2001
  8. +5
    -5
      doc/old/CHANGELOG-2002
  9. +44
    -44
      doc/old/CHANGELOG-2003
  10. +1
    -1
      doc/sde-wrapper.txt
  11. +3
    -3
      etc/desc_format
  12. +3
    -3
      etc/download.sed
  13. +3
    -3
      lib/core-functions.in
  14. +23
    -23
      lib/functions.in
  15. +8
    -8
      lib/init/formats/tail.in
  16. +3
    -3
      lib/init/install_cron.in
  17. +3
    -3
      lib/init/install_desktop.in
  18. +3
    -3
      lib/init/install_init.in
  19. +3
    -3
      lib/init/install_postinstall.in
  20. +3
    -3
      lib/init/parse-config
  21. +3
    -3
      lib/jailing/config.hlp
  22. +3
    -3
      lib/jailing/config.in
  23. +6
    -6
      lib/jailing/dbmail-db-header-path.patch
  24. +8
    -8
      lib/jailing/package-functions
  25. +5
    -5
      lib/jailing/parse-config
  26. +3
    -3
      lib/jailing/postsysfiles.in
  27. +3
    -3
      lib/libsde.in
  28. +7
    -7
      lib/lua/lzlib/lzlib.c
  29. +4
    -4
      lib/lua/lzlib/zlibtest.lua
  30. +4
    -4
      lib/lua/parse-db.lua
  31. +4
    -4
      lib/lua/parse-desc.lua
  32. +5
    -5
      lib/lua/sde/desc.lua
  33. +20
    -20
      lib/lua/sde/getopt.lua
  34. +6
    -6
      lib/lua/sde/hooks.lua
  35. +3
    -3
      lib/lua/sde/pkgdb.lua
  36. +3
    -3
      lib/misc/AuditBuild.sh
  37. +3
    -3
      lib/misc/GenDepGraph.sh
  38. +3
    -3
      lib/misc/PackBuildInfo.sh
  39. +4
    -4
      lib/misc/RegressionsReport.sh
  40. +3
    -3
      lib/misc/adddownload.sh
  41. +3
    -3
      lib/misc/apply-patch.sh
  42. +14
    -14
      lib/misc/bash-xterm.patch
  43. +4
    -4
      lib/misc/cacheinjector.sh
  44. +7
    -7
      lib/misc/catedit.sh
  45. +4
    -4
      lib/misc/ccat.c
  46. +9
    -9
      lib/misc/cdromchk.c
  47. +11
    -11
      lib/misc/compare.sh
  48. +4
    -4
      lib/misc/compare_builddirs.sh
  49. +6
    -6
      lib/misc/copypackage.sh
  50. +3
    -3
      lib/misc/cvsaddrm.sh
  51. +3
    -3
      lib/misc/cvsmv.sh
  52. +4
    -4
      lib/misc/findorphans.sh
  53. +3
    -3
      lib/misc/fixmaintainer.sh
  54. +3
    -3
      lib/misc/getdefs.sh
  55. +3
    -3
      lib/misc/hello.c
  56. +5
    -5
      lib/misc/hello.cc
  57. +2
    -2
      lib/misc/hello.cs
  58. +5
    -5
      lib/misc/hello.f
  59. +5
    -5
      lib/misc/hello.java
  60. +3
    -3
      lib/misc/hunter.sh
  61. +5
    -5
      lib/misc/iso2stick.sh
  62. +3
    -3
      lib/misc/killport.sh
  63. +3
    -3
      lib/misc/killtree.sh
  64. +3
    -3
      lib/misc/mini-makedevs.sh
  65. +5
    -5
      lib/misc/mklibs.sh
  66. +3
    -3
      lib/misc/regtest.sh
  67. +3
    -3
      lib/misc/reverse-log.pl
  68. +5
    -5
      lib/misc/scrsav.c
  69. +3
    -3
      lib/misc/showdeps.sh
  70. +3
    -3
      lib/misc/showsorteddeps.sh
  71. +3
    -3
      lib/misc/split-patch.pl
  72. +9
    -9
      lib/misc/tcp-client.c
  73. +3
    -3
      lib/misc/treenice.sh
  74. +15
    -15
      lib/misc/xctrld.c
  75. +5
    -5
      lib/misc/xline.c
  76. +3
    -3
      lib/output/config-100.in
  77. +3
    -3
      lib/output/parse-config
  78. +3
    -3
      lib/output/terminal
  79. +5
    -5
      lib/parse-config
  80. +3
    -3
      lib/sde-binary/package-gem.sh
  81. +3
    -3
      lib/sde-binary/package.sh
  82. +3
    -3
      lib/sde-binary/preconfig.in
  83. +3
    -3
      lib/sde-build/config.cache
  84. +4
    -4
      lib/sde-cleanup/cleanup.sh
  85. +3
    -3
      lib/sde-commit/commit-message.awk
  86. +3
    -3
      lib/sde-config/config-games.hlp
  87. +3
    -3
      lib/sde-config/config-games.in
  88. +3
    -3
      lib/sde-config/config-libs.hlp
  89. +3
    -3
      lib/sde-config/config-libs.in
  90. +6
    -6
      lib/sde-config/config.hlp
  91. +5
    -5
      lib/sde-config/functions.in
  92. +5
    -5
      lib/sde-config/main.in
  93. +6
    -6
      lib/sde-config/pkgsel2awk.sh
  94. +3
    -3
      lib/sde-download/cksum.sh
  95. +3
    -3
      lib/sde-download/mirror-test.sh
  96. +3
    -3
      lib/sde-download/validate.sh
  97. +3
    -3
      lib/sde-package.in
  98. +71
    -71
      lib/sde-package/BeautifulSoup.py
  99. +6
    -6
      lib/sde-package/info.py
  100. +15
    -15
      lib/sde-package/new-debian.py

+ 2
- 2
doc/HISTORY

@ -19,13 +19,13 @@ build engine which should result in a more efficient and flexible
framework and lower the entry level for users as well as framework and lower the entry level for users as well as
developers. OpenSDE, then two months later, after personal and many developers. OpenSDE, then two months later, after personal and many
technical differences, was detached into its own project by technical differences, was detached into its own project by
Alejandro Mery, supported by T2 as well as former ROCK-Linux
Alejandro Mery, supported by T2 as well as former ROCK-Linux
developers. developers.
The SDE concept is intended as an open framework to build an operating The SDE concept is intended as an open framework to build an operating
system (not necessarily restricted to GNU/Linux) enabling the creation system (not necessarily restricted to GNU/Linux) enabling the creation
of systems for diverse architectures with various boot options and a of systems for diverse architectures with various boot options and a
tailored software selection.
tailored software selection.
OpenSDE has now turned into an ambitious purely team-lead project OpenSDE has now turned into an ambitious purely team-lead project
where decisions are made based on their technical merit uninfluenced where decisions are made based on their technical merit uninfluenced

+ 2
- 2
doc/LIB64-UGLY-HACKED-PACKAGES

@ -1,6 +1,6 @@
This file includes packages we've hacked to get them build on This file includes packages we've hacked to get them build on
*-64 architectures and which should be fixed after we have
lib64/,lib/ -> lib32/,lib64/ + symlink
*-64 architectures and which should be fixed after we have
lib64/,lib/ -> lib32/,lib64/ + symlink
package things to do package things to do
----------- --------------------------------------------------------- ----------- ---------------------------------------------------------

+ 1
- 1
doc/PKG-BUILD-VARS

@ -6,7 +6,7 @@ config ........ Name of the active configuration ($base/config/$config/..)
extraver ...... version text after the fist whitespace, or $sdever extraver ...... version text after the fist whitespace, or $sdever
sdever ........ T2 SDE Version (including rel. date for snapshots) sdever ........ T2 SDE Version (including rel. date for snapshots)
pkg ........... base name part of the package we are building
pkg ........... base name part of the package we are building
xpkg .......... derived name part of the package we are building xpkg .......... derived name part of the package we are building
if a package is not pkgfork'd, pkg == xpkg if a package is not pkgfork'd, pkg == xpkg
ver ........... package Version (from *.desc - until first whitespace) ver ........... package Version (from *.desc - until first whitespace)

+ 1
- 1
doc/files/LICENSE-WARNING

@ -19,7 +19,7 @@ Developer - the developers of the T2-SDE providing and developing
(3) The developers of the T2-SDE scripts are not responsible and deny (3) The developers of the T2-SDE scripts are not responsible and deny
any liability for the mis-use of their efforts to provide a flexible any liability for the mis-use of their efforts to provide a flexible
system development environment respective distribution build kit. system development environment respective distribution build kit.
The developers have added resonable checks to make sure, the The developers have added resonable checks to make sure, the
integrator is aware of the licensing issues involved with this integrator is aware of the licensing issues involved with this
distribution. distribution.

+ 1
- 1
doc/old/CHANGELOG-1999

@ -709,7 +709,7 @@
*) 1999-07-29 (1.0b13 - 1.0b14) *) 1999-07-29 (1.0b13 - 1.0b14)
- Added: nasm-0.98 (opt), syslinux-1.45 (opt) - Added: nasm-0.98 (opt), syslinux-1.45 (opt)
- Updated: PerlFS-0.07, ggi-devel-990729, isdn4k-utils-9907271100
- Updated: PerlFS-0.07, ggi-devel-990729, isdn4k-utils-9907271100
- Wrote the first dump-config code (look at misc/dump-config/*) - Wrote the first dump-config code (look at misc/dump-config/*)
- No login program for the Install/Rescue Disk - just open a root shell - No login program for the Install/Rescue Disk - just open a root shell
- Changed /etc/inittab: On default only open a agetty on /dev/console - Changed /etc/inittab: On default only open a agetty on /dev/console

+ 3
- 3
doc/old/CHANGELOG-2000

@ -442,7 +442,7 @@
*) 2000-07-29 (1.3.10 - 1.3.11) *) 2000-07-29 (1.3.10 - 1.3.11)
- Martin Sieper: updated Midnight-Commander devfs patch - Martin Sieper: updated Midnight-Commander devfs patch
- Updated: linux-2.4.0-test5 (+ dags hotfix), Added popt (needed by oaf)
- Updated: linux-2.4.0-test5 (+ dags hotfix), Added popt (needed by oaf)
- Added popt (needed by oaf), Fixed: rpm, pcmcia-cs, ghostscript, sawfish - Added popt (needed by oaf), Fixed: rpm, pcmcia-cs, ghostscript, sawfish
*) 2000-07-26 (1.3.10 - 1.3.11) *) 2000-07-26 (1.3.10 - 1.3.11)
@ -484,7 +484,7 @@
- Homepage: added CHANGELOG archive with weekly summaries - Homepage: added CHANGELOG archive with weekly summaries
- Changed directory tree of binary distribution (rock-<arch>-<ver>/*) - Changed directory tree of binary distribution (rock-<arch>-<ver>/*)
- Quick-and-Dirty changes in install-disks for new binary dist - tree - Quick-and-Dirty changes in install-disks for new binary dist - tree
- Stefan Paletta: added lvm-0.8final, fixed pkg-config/guile permissions
- Stefan Paletta: added lvm-0.8final, fixed pkg-config/guile permissions
- Minor scripts/Create-CrossCC hotfix (library links in usr/<arch>/lib) - Minor scripts/Create-CrossCC hotfix (library links in usr/<arch>/lib)
- Cross-Build fixes for util-linux, install-disks and scripts/Build-Stage - Cross-Build fixes for util-linux, install-disks and scripts/Build-Stage
@ -1267,7 +1267,7 @@
- Updated: a2ps-4.12k, bonobo-0.6, gdk-pixbuf-0.5.0, gnumeric-0.48, - Updated: a2ps-4.12k, bonobo-0.6, gdk-pixbuf-0.5.0, gnumeric-0.48,
gtk-engines-0.10, irda-utils-0.9.9, isdn4k-utils-0001271200, gtk-engines-0.10, irda-utils-0.9.9, isdn4k-utils-0001271200,
pcmcia-cs-3.1.9, setserial-2.17
pcmcia-cs-3.1.9, setserial-2.17
*) 2000-01-24 (1.3.7 - 1.3.8) *) 2000-01-24 (1.3.7 - 1.3.8)

+ 1
- 1
doc/old/CHANGELOG-2001

@ -635,7 +635,7 @@
*) 2001-03-01 (1.3.11 - 1.5.12) *) 2001-03-01 (1.3.11 - 1.5.12)
- DagB: Fixed util-linux (./clock dir is now named ./hwclock) - DagB: Fixed util-linux (./clock dir is now named ./hwclock)
- From stable tree: fixed perl (hostname = localhost),
- From stable tree: fixed perl (hostname = localhost),
ggv (update to 1.0-beta1 and a small patch), ggv (update to 1.0-beta1 and a small patch),
fixed netpbm (fixed path of perl in 'configure') fixed netpbm (fixed path of perl in 'configure')
- DagB: updated misc/linux/00-hotfixes.patch - DagB: updated misc/linux/00-hotfixes.patch

+ 5
- 5
doc/old/CHANGELOG-2002

@ -578,7 +578,7 @@
*) 2002-08-18 (1.5.12 - 1.7.0) *) 2002-08-18 (1.5.12 - 1.7.0)
- Rene Rebe: updated ogg-vorbis-1.0, alsa-0.9.0rc3 and kde-3.0.3
- Rene Rebe: updated ogg-vorbis-1.0, alsa-0.9.0rc3 and kde-3.0.3
- Thomas Jakobi: fixed scripts/Download to not use -I for tar - Thomas Jakobi: fixed scripts/Download to not use -I for tar
*) 2002-08-18 (1.5.12 - 1.7.0) *) 2002-08-18 (1.5.12 - 1.7.0)
@ -590,7 +590,7 @@
*) 2002-08-17 (1.5.12 - 1.7.0) *) 2002-08-17 (1.5.12 - 1.7.0)
- Rene Rebe: fixed termcap, added usr/tmp to the flistdel, corrected flist - Rene Rebe: fixed termcap, added usr/tmp to the flistdel, corrected flist
warning to exlucde all /tmp/ directories
warning to exlucde all /tmp/ directories
updated qt-3.0.5 and reenabled i18n for koffice updated qt-3.0.5 and reenabled i18n for koffice
fixed four packages to be non-optional fixed four packages to be non-optional
@ -689,8 +689,8 @@
- Updated: alsa-0.9.0rc2, bash-2.05b, binutils-2.12.90.0.15, - Updated: alsa-0.9.0rc2, bash-2.05b, binutils-2.12.90.0.15,
cpio-2.5, curl-7.9.8, dump-0.4b29, file-3.39, gdb-5.2.1, cpio-2.5, curl-7.9.8, dump-0.4b29, file-3.39, gdb-5.2.1,
gettext-0.11.3, ghostscript-7.21, groff-1.18, gsl-1.2,
ifhp-3.5.10, libsafe-2.0-16, LPRng-3.8.13, lvm_1.0.5,
gettext-0.11.3, ghostscript-7.21, groff-1.18, gsl-1.2,
ifhp-3.5.10, libsafe-2.0-16, LPRng-3.8.13, lvm_1.0.5,
man-pages-1.52, man-1.5k, modutils-2.4.18, netpbm-10.5, man-pages-1.52, man-1.5k, modutils-2.4.18, netpbm-10.5,
nfs-utils-1.0.1, pcmcia-cs-3.1.34, quota-3.06, readline-4.3, nfs-utils-1.0.1, pcmcia-cs-3.1.34, quota-3.06, readline-4.3,
sendmail-8.12.5, tcsh-6.12.00, units-1.80 sendmail-8.12.5, tcsh-6.12.00, units-1.80
@ -1275,7 +1275,7 @@
*) 2002-03-07 (1.5.12 - 1.7.0) *) 2002-03-07 (1.5.12 - 1.7.0)
- Sebastian Jaenicke: Fixed scripts/Update-Src
- Sebastian Jaenicke: Fixed scripts/Update-Src
- Created package tree 'extra2' (maintained by clifford) - Created package tree 'extra2' (maintained by clifford)
- Improved the automatic creation of the kernel config - Improved the automatic creation of the kernel config
- Added midimountain and spiralsynthmodular in extra2 - Added midimountain and spiralsynthmodular in extra2

+ 44
- 44
doc/old/CHANGELOG-2003

@ -116,7 +116,7 @@
- Alejandro Mery: updated mono, mono-doc, mono-debugger, mono-xsp, - Alejandro Mery: updated mono, mono-doc, mono-debugger, mono-xsp,
mod_mono, gtk-sharp mod_mono, gtk-sharp
added links package added links package
updated cron and fix bind
updated cron and fix bind
- updated subversion (0.34.0) - updated subversion (0.34.0)
- added default bdb selection to the apache config.in (defaults to 42) - added default bdb selection to the apache config.in (defaults to 42)
- added ifplugd (and so libdaemon) - added ifplugd (and so libdaemon)
@ -528,7 +528,7 @@
- fixed xjdic23 to build correclty and for random return value e.g. PowerPC - fixed xjdic23 to build correclty and for random return value e.g. PowerPC
- Andreas V. Meier: added avm/aalib - Andreas V. Meier: added avm/aalib
- Sebastian Jaenicke: updated courier-imap and maildrop - Sebastian Jaenicke: updated courier-imap and maildrop
- Dimitar Zhekov: fixed xfree86-cyrillic-fonts
- Dimitar Zhekov: fixed xfree86-cyrillic-fonts
- reverted (hopefully all) lib/*.{a.la} - > usr/lib/ changes and replaced - reverted (hopefully all) lib/*.{a.la} - > usr/lib/ changes and replaced
the code with a post-flist solution which works more package independet the code with a post-flist solution which works more package independet
and allows the adaption of the .la files and allows the adaption of the .la files
@ -863,7 +863,7 @@
- Sebastian Jaenicke: updated bsd-games and ircii - Sebastian Jaenicke: updated bsd-games and ircii
- Dimitar Zhekov: updated jimmy repository and added xfce4 repository - Dimitar Zhekov: updated jimmy repository and added xfce4 repository
- Alejandro Mery: boehm-gc - complete integration - Alejandro Mery: boehm-gc - complete integration
*) 2003-09-01 (2.0.0-rc1 - 2.0.0-rc2) [RENE] *) 2003-09-01 (2.0.0-rc1 - 2.0.0-rc2) [RENE]
- updated wv2 and koffice - updated wv2 and koffice
@ -926,7 +926,7 @@
- Juergen Sawinski: isdn4k-utils, ifhp, aspell, units and raidtools for - Juergen Sawinski: isdn4k-utils, ifhp, aspell, units and raidtools for
e.g. gcc33 e.g. gcc33
- Daniel Pischl: updated icewm - Daniel Pischl: updated icewm
- Juergen Sawinski: multiple package additions/updates for the jsaw repository
- Juergen Sawinski: multiple package additions/updates for the jsaw repository
- added the TeX -> HTML generator TeX4ht now used for the rock-handbook - added the TeX -> HTML generator TeX4ht now used for the rock-handbook
- Sebastian Jaenicke: slrn - Sebastian Jaenicke: slrn
@ -1078,12 +1078,12 @@
*) 2003-08-09 (2.0.0-camp - 2.0.0-rc1) [RENE] *) 2003-08-09 (2.0.0-camp - 2.0.0-rc1) [RENE]
- fixed mkinitrd.sh (s/rdir/rmdir/)
- fixed mkinitrd.sh (s/rdir/rmdir/)
*) 2003-08-07 (2.0.0-camp - 2.0.0-rc1) [RENE] *) 2003-08-07 (2.0.0-camp - 2.0.0-rc1) [RENE]
- added QTDIR and KDEDIR$ver exports to the qt and kdelibs packages (and - added QTDIR and KDEDIR$ver exports to the qt and kdelibs packages (and
fixed the kdelibs package to really create the profile.d file ...)
fixed the kdelibs package to really create the profile.d file ...)
- added x86/help2 to the bootdisk - added x86/help2 to the bootdisk
*) 2003-08-06 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-08-06 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
@ -1128,7 +1128,7 @@
- powerpc and shared kernel config tweaks - powerpc and shared kernel config tweaks
- yaboot documentaion copy and special rs6k file preparations - yaboot documentaion copy and special rs6k file preparations
- linux24.conf special ppc handling (for rs6k) - linux24.conf special ppc handling (for rs6k)
*) 2003-08-02 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-08-02 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
- fixed zlib to only install into $root/... and refactored the code - fixed zlib to only install into $root/... and refactored the code
@ -1179,7 +1179,7 @@
*) 2003-07-28 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-07-28 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
- Dimitar Zhekov: all pending patches (except linux-full-config), bash, - Dimitar Zhekov: all pending patches (except linux-full-config), bash,
bootdisk, xfree, shared files, nullmailer, terminus, ...
bootdisk, xfree, shared files, nullmailer, terminus, ...
- Alejandro Mery: updated patchutils, man-pages, ethereal and fixed - Alejandro Mery: updated patchutils, man-pages, ethereal and fixed
keepalived and shadow keepalived and shadow
- Stefan Paletta: fixed lvm prefix, lynx path encoding, ipv6 libcap, lesstif - Stefan Paletta: fixed lvm prefix, lynx path encoding, ipv6 libcap, lesstif
@ -1189,7 +1189,7 @@
- Sebastian Jaenicke: fixed sendmail (rmail) - Sebastian Jaenicke: fixed sendmail (rmail)
- Alan J. Wylie: improved 00-update to process the info pages correctly - Alan J. Wylie: improved 00-update to process the info pages correctly
- added ARM architecture definitions - added ARM architecture definitions
*) 2003-07-28 (2.0.0-beta7 - 2.0.0-rc1) [CLIFFORD] *) 2003-07-28 (2.0.0-beta7 - 2.0.0-rc1) [CLIFFORD]
- Fixed gawk-3.1.3 for dietlibc (e.g. needed in install disks and router) - Fixed gawk-3.1.3 for dietlibc (e.g. needed in install disks and router)
@ -1203,7 +1203,7 @@
- x86_64 (AMD 64) restructuring and fixing - x86_64 (AMD 64) restructuring and fixing
- Alejandro Mery: mnemoc repository update - Alejandro Mery: mnemoc repository update
- Chris Sirkull: fixed dansguardian - Chris Sirkull: fixed dansguardian
- fake: added rsynth
- fake: added rsynth
- Miguel A. Bolanos: renamed some 2.5 kernel strings to 2.6 - Miguel A. Bolanos: renamed some 2.5 kernel strings to 2.6
- Piotr Esden-Tempski: esden repository update - Piotr Esden-Tempski: esden repository update
Create-SrcTar create the download/INDEX if needed Create-SrcTar create the download/INDEX if needed
@ -1223,7 +1223,7 @@
- Juergen Sawinski: updates and fixes for libgda, libgnomedb and mergeant - Juergen Sawinski: updates and fixes for libgda, libgnomedb and mergeant
- Daniel Pischl: updated gaim - Daniel Pischl: updated gaim
- Piotr Esden-Tempski: updated and so fixed nfs-utils - Piotr Esden-Tempski: updated and so fixed nfs-utils
*) 2003-07-23 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-07-23 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
- fixed linux* cross compilation for all architectures - fixed linux* cross compilation for all architectures
@ -1233,7 +1233,7 @@
- Dimitar Zhekov: fixed eject to not install i18n files when NLS is disabled - Dimitar Zhekov: fixed eject to not install i18n files when NLS is disabled
- Stefan Paletta: added bluetooth definitions to default modules.conf - Stefan Paletta: added bluetooth definitions to default modules.conf
improved the bluez packages improved the bluez packages
*) 2003-07-22 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-07-22 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
- fixed the linux packages do not run dep or dep-files for 25 and newer - fixed the linux packages do not run dep or dep-files for 25 and newer
@ -1304,7 +1304,7 @@
- Stefan Paletta: really fixed openh323 to not install CVS dirs - Stefan Paletta: really fixed openh323 to not install CVS dirs
- Chris Sirkull: fixed mysql init script - Chris Sirkull: fixed mysql init script
- Sandra Dismar: added zsh and openbox - Sandra Dismar: added zsh and openbox
*) 2003-07-17 (2.0.0-beta7 - 2.0.0-rc1) [RENE] *) 2003-07-17 (2.0.0-beta7 - 2.0.0-rc1) [RENE]
- Dimitar Zhekov: updated terminus-font and zgv - Dimitar Zhekov: updated terminus-font and zgv
@ -1319,8 +1319,8 @@
*) 2003-07-16 (2.0.0-beta6 - 2.0.0-beta7) [RENE] *) 2003-07-16 (2.0.0-beta6 - 2.0.0-beta7) [RENE]
- Chris Sirkull: sirkull repository update
- Juergen Sawinski: added gcombust, sword, gnomesword and bibletime
- Chris Sirkull: sirkull repository update
- Juergen Sawinski: added gcombust, sword, gnomesword and bibletime
*) 2003-07-15 (2.0.0-beta6 - 2.0.0-beta7) [RENE] *) 2003-07-15 (2.0.0-beta6 - 2.0.0-beta7) [RENE]
@ -1384,7 +1384,7 @@
- fill some Documentation gaps - fill some Documentation gaps
- Alejandro Mery: some fixed for rsbac - Alejandro Mery: some fixed for rsbac
- Dimitar Zhekov: gtk+1 font hack - Dimitar Zhekov: gtk+1 font hack
*) 2003-07-08 (2.0.0-beta6 - 2.0.0-beta7) [RENE] *) 2003-07-08 (2.0.0-beta6 - 2.0.0-beta7) [RENE]
- Alejandro Mery: various mnemoc updates - Alejandro Mery: various mnemoc updates
@ -1397,7 +1397,7 @@
- updated xfree86 - updated xfree86
- fixed linux25 config creation and powerpc kernel configs - fixed linux25 config creation and powerpc kernel configs
- Alejandro Mery: enabled imap in mutt, updated /etc/services and - Alejandro Mery: enabled imap in mutt, updated /etc/services and
fixed openssh
fixed openssh
- Miguel A. Bolanos: updated several alessandro packages - Miguel A. Bolanos: updated several alessandro packages
updated and added several gnome2 packages updated and added several gnome2 packages
updated lilo and several x11 packages updated lilo and several x11 packages
@ -1454,7 +1454,7 @@
an non-ROCK init script an non-ROCK init script
- Alan J. Wylie: updated libgsf for gnumeic - Alan J. Wylie: updated libgsf for gnumeic
- fixed system.int to register /sbin/rockplug as hotplug agent - fixed system.int to register /sbin/rockplug as hotplug agent
*) 2003-06-30 (2.0.0-beta6 - 2.0.0-beta7) [RENE] *) 2003-06-30 (2.0.0-beta6 - 2.0.0-beta7) [RENE]
- updated tex-ttf - updated tex-ttf
@ -1472,7 +1472,7 @@
*) 2003-06-27 (2.0.0-beta6 - 2.0.0-beta7) [RENE] *) 2003-06-27 (2.0.0-beta6 - 2.0.0-beta7) [RENE]
- Dimitar Zhekov: add i18n fix to ne and removed flist_add from svgalib
- Dimitar Zhekov: add i18n fix to ne and removed flist_add from svgalib
- Daniel Jahre: fixed ypbind - Daniel Jahre: fixed ypbind
- Miguel A. Bolanos: updated groff - Miguel A. Bolanos: updated groff
- Stefan Paletta and Dimitar Zhekov: man, groff, less and mc various fixes - Stefan Paletta and Dimitar Zhekov: man, groff, less and mc various fixes
@ -1550,10 +1550,10 @@
- updated linux25* - updated linux25*
- Alejandro Mery: sysv_nice cleanup - Alejandro Mery: sysv_nice cleanup
- Chris Sirkull: updated clamav - Chris Sirkull: updated clamav
*) 2003-06-21 (2.0.0-beta5 - 2.0.0-beta6) [RENE] *) 2003-06-21 (2.0.0-beta5 - 2.0.0-beta6) [RENE]
- Terry Mackintosh: fixed sysfiles /etc/services creation
- Terry Mackintosh: fixed sysfiles /etc/services creation
- updated mol to a rsync snapshot that works (plus first set of of DevFS - updated mol to a rsync snapshot that works (plus first set of of DevFS
and useability patches) and useability patches)
- fixed linux24benh kernel to export yet-another-symbol MOL needs - fixed linux24benh kernel to export yet-another-symbol MOL needs
@ -1590,7 +1590,7 @@
- version bump - version bump
- Alessandro Ferrari: updated ifenslave - Alessandro Ferrari: updated ifenslave
- Chris Sirkull: updated dansguard
- Chris Sirkull: updated dansguard
- fixed kdebase31 to install all files I added weeks ago - fixed kdebase31 to install all files I added weeks ago
- updaded subversion (0.24 was left out intentionally - since it was - updaded subversion (0.24 was left out intentionally - since it was
official declared buggy ...) official declared buggy ...)
@ -1677,7 +1677,7 @@
- bootdisk target work for conditional packages per architecture, a logo - bootdisk target work for conditional packages per architecture, a logo
for the ppc greeting and a dynamic fdisk-style app detection for the for the ppc greeting and a dynamic fdisk-style app detection for the
mod_install (STONE module) mod_install (STONE module)
- Mathieu: updated mldonkey
- Mathieu: updated mldonkey
*) 2003-06-09 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD] *) 2003-06-09 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD]
@ -1691,13 +1691,13 @@
- Stefan Paletta: legal crap package/{x11,rene} - Stefan Paletta: legal crap package/{x11,rene}
- Benjamin Schieder: nethack cleanup, fix qt typo and add subconfig-*.hlp - Benjamin Schieder: nethack cleanup, fix qt typo and add subconfig-*.hlp
added libraw1394, libavc1394, dvgrab and kino added libraw1394, libavc1394, dvgrab and kino
*) 2003-06-07 (2.0.0-beta3 - 2.0.0-beta4) [RENE] *) 2003-06-07 (2.0.0-beta3 - 2.0.0-beta4) [RENE]
- fixed / improved samba .init scripts - fixed / improved samba .init scripts
- Miguel A. Bolanos: added rockplug to bootdisk - Miguel A. Bolanos: added rockplug to bootdisk
- Alejandro Mery: added gcc33 and imporved the gcc scripts - Alejandro Mery: added gcc33 and imporved the gcc scripts
- added new KERNEL package flag and tagged the kernel binary packages
- added new KERNEL package flag and tagged the kernel binary packages
- merged support for mulitple kernel from my iBook - merged support for mulitple kernel from my iBook
- since now multiple kernels are supported made linux25 build by default - since now multiple kernels are supported made linux25 build by default
- updated linux25* (2.5.70) and rediffed the patches that did not apply - updated linux25* (2.5.70) and rediffed the patches that did not apply
@ -1744,7 +1744,7 @@
*) 2003-06-01 (2.0.0-beta3 - 2.0.0-beta4) [RENE] *) 2003-06-01 (2.0.0-beta3 - 2.0.0-beta4) [RENE]
- Kai Schwenzfeier: fixed libsdl_perl and kapitalist - Kai Schwenzfeier: fixed libsdl_perl and kapitalist
- Alejandro Mery: updated php, postfix and pcre
- Alejandro Mery: updated php, postfix and pcre
- Daniel Pischl: updated xchat - Daniel Pischl: updated xchat
- cleanup of devfsd.conf and added v4l devfsd.d conf - cleanup of devfsd.conf and added v4l devfsd.d conf
- added a useful default for the "Times" font. - added a useful default for the "Times" font.
@ -1755,7 +1755,7 @@
*) 2003-05-30 (2.0.0-beta3 - 2.0.0-beta4) [RENE] *) 2003-05-30 (2.0.0-beta3 - 2.0.0-beta4) [RENE]
- Miguel A. Bolanos: fixed bacterium and uucp - Miguel A. Bolanos: fixed bacterium and uucp
updated uucp
updated uucp
- Mathieu: updating mldonkey to 2.5, adding duplicity (and librsync - Mathieu: updating mldonkey to 2.5, adding duplicity (and librsync
as a dependency) as a dependency)
- Stefan Gutschireiter: fixed curl - Stefan Gutschireiter: fixed curl
@ -1776,7 +1776,7 @@
- Benjamin Schieder: blindcoder rep, freedroid - Benjamin Schieder: blindcoder rep, freedroid
- Kai: improved freedroid_rpg - Kai: improved freedroid_rpg
- spent too much time improving the catedit ... - spent too much time improving the catedit ...
- Juergen Sawinski: updated the enalbed IDE driver list
- Juergen Sawinski: updated the enalbed IDE driver list
- Daniel Pischl: updated apache - Daniel Pischl: updated apache
*) 2003-05-26 (2.0.0-beta2 - 2.0.0-beta3) [RENE] *) 2003-05-26 (2.0.0-beta2 - 2.0.0-beta3) [RENE]
@ -1786,12 +1786,12 @@
- Clifford Wolf: [Patch] 200305261154 - Clifford Wolf: [Patch] 200305261154
*) 2003-05-25 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD] *) 2003-05-25 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD]
- Added new *.cache files from latest reference build - Added new *.cache files from latest reference build
- Moved 'missing or wrong file detection' from target/generic to Built-Target - Moved 'missing or wrong file detection' from target/generic to Built-Target
- Multiple importand fixes to 'missing or wrong file detection' - Multiple importand fixes to 'missing or wrong file detection'
- Fixed mine.conf for real cross-building between architectures - Fixed mine.conf for real cross-building between architectures
*) 2003-05-25 (2.0.0-beta2 - 2.0.0-beta3) [RENE] *) 2003-05-25 (2.0.0-beta2 - 2.0.0-beta3) [RENE]
- stoned mac_hid configuration and init script - stoned mac_hid configuration and init script
@ -1829,13 +1829,13 @@
- updated xemacs-packages (for the rolling issue textual example ;-) - updated xemacs-packages (for the rolling issue textual example ;-)
*) 2003-05-22 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD] *) 2003-05-22 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD]
- Alessandro Ferrari: Cleanups in perl5.conf - Alessandro Ferrari: Cleanups in perl5.conf
- Fixed many shared-files conflicts in base, x11, rene, tsa and gnome2 rep. - Fixed many shared-files conflicts in base, x11, rene, tsa and gnome2 rep.
- Added package/base/perl5/perllocal_hack.sh for imagemagick and gtk-perl - Added package/base/perl5/perllocal_hack.sh for imagemagick and gtk-perl
- Added linux-drm package and disabled drm drivers in standard kernel - Added linux-drm package and disabled drm drivers in standard kernel
- Fixed cross-building mine (in stages 0 and 1) - Fixed cross-building mine (in stages 0 and 1)
*) 2003-05-21 (2.0.0-beta2 - 2.0.0-beta3) [RENE] *) 2003-05-21 (2.0.0-beta2 - 2.0.0-beta3) [RENE]
- Alejandro Mery: psmics fix for gcc33 - Alejandro Mery: psmics fix for gcc33
@ -1877,7 +1877,7 @@
- fixed mozilla - fixed mozilla
- updated alsaplayer kde* - updated alsaplayer kde*
- corrected gcc3's parse-config so it doe set CC correctly - corrected gcc3's parse-config so it doe set CC correctly
*) 2003-05-18 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD] *) 2003-05-18 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD]
- Did run ./Create-CopyPatch and applied the patch (>1 MB) - Did run ./Create-CopyPatch and applied the patch (>1 MB)
@ -1914,7 +1914,7 @@
*) 2003-05-15 (2.0.0-beta2 - 2.0.0-beta3) [RENE] *) 2003-05-15 (2.0.0-beta2 - 2.0.0-beta3) [RENE]
- Alejandro Mery: fixed linux24 for gcc33 - Alejandro Mery: fixed linux24 for gcc33
- Nikolaus Filus: register_wm instrumentation, cleanup of: gv,
- Nikolaus Filus: register_wm instrumentation, cleanup of: gv,
nikolaus and kasc repository, fixed evolution by readding gal01 and nikolaus and kasc repository, fixed evolution by readding gal01 and
gtkhtml, fixed bzflag gtkhtml, fixed bzflag
- Sebastian Jaenicke: updated ethereal and nessus - Sebastian Jaenicke: updated ethereal and nessus
@ -2620,7 +2620,7 @@
- Rene Rebe: Updated GNOME to 2.2 and removed some outdated packages - Rene Rebe: Updated GNOME to 2.2 and removed some outdated packages
- Rene Rebe: Fixed some gnome and kde packages - Rene Rebe: Fixed some gnome and kde packages
- Rene Rebe: Added gcc-snapshot for regression tests - Rene Rebe: Added gcc-snapshot for regression tests
- Moved package/(.*?)-(.*?)/ to package/$1$2/
- Moved package/(.*?)-(.*?)/ to package/$1$2/
- Various bootdisk target cleanups - Various bootdisk target cleanups
*) 2003-03-09 (1.5.12 - 1.7.0) [RENE] *) 2003-03-09 (1.5.12 - 1.7.0) [RENE]
@ -2693,13 +2693,13 @@
- simplified cyrus-sasl config - simplified cyrus-sasl config
- updated qt (3.1.2) and fixed xfree to not install the deprecated XftConfig - updated qt (3.1.2) and fixed xfree to not install the deprecated XftConfig
- fixed the desktop target to include architecture specific packages - fixed the desktop target to include architecture specific packages
- updated sendmail
- Merged various patches from the ML:
- updated sendmail
- Merged various patches from the ML:
- Sebastian Jaenicke: updated nessus - Sebastian Jaenicke: updated nessus
- Alejandro Mery: added rsbac - Alejandro Mery: added rsbac
- Kai Schwenzfeier: added directfb, libsdl_perl, dfbsee, frozen-bubble - Kai Schwenzfeier: added directfb, libsdl_perl, dfbsee, frozen-bubble
- Kai Schwenzfeier: added gnuchess, xboard, gnubg, xarchon, xskat - Kai Schwenzfeier: added gnuchess, xboard, gnubg, xarchon, xskat
- Juergen Sawinski: fixed errno for jfsutils, tcp_wrappers and portmap
- Juergen Sawinski: fixed errno for jfsutils, tcp_wrappers and portmap
- Benjamin Schieder: updated categories in his repository - Benjamin Schieder: updated categories in his repository
- fixed kdelibs-31/config.in to check for the correct package - fixed kdelibs-31/config.in to check for the correct package
- updated sodipodi - updated sodipodi
@ -2730,14 +2730,14 @@
*) 2003-03-05 (1.5.12 - 1.7.0) [RENE] *) 2003-03-05 (1.5.12 - 1.7.0) [RENE]
- fixed the desktop target to include architecture specific packages - fixed the desktop target to include architecture specific packages
- updated sendmail
- Merged various patches from the ML:
- updated sendmail
- Merged various patches from the ML:
- Sebastian Jaenicke: updated nessus - Sebastian Jaenicke: updated nessus
- Alejandro Mery: added rsbac - Alejandro Mery: added rsbac
- niteblade: added directfb, libsdl_perl, dfbsee, frozen-bubble, - niteblade: added directfb, libsdl_perl, dfbsee, frozen-bubble,
xarchon, xskat
xarchon, xskat
- niteblade: added gnuchess, xboard, gnubg - niteblade: added gnuchess, xboard, gnubg
- Juergen Sawinski: fixed errno for jfsutils, tcp_wrappers and portmap
- Juergen Sawinski: fixed errno for jfsutils, tcp_wrappers and portmap
- Benjamin Schieder: updated categories in his repository - Benjamin Schieder: updated categories in his repository
*) 2003-03-04 (1.5.12 - 1.7.0) [RENE] *) 2003-03-04 (1.5.12 - 1.7.0) [RENE]
@ -2834,7 +2834,7 @@
- various rene repository changed incl. renaming the microsoft fonts package, - various rene repository changed incl. renaming the microsoft fonts package,
adding the new bitstream-vera-fonts, ... adding the new bitstream-vera-fonts, ...
- fixed xfree86 to create the TrueType font-dir - fixed xfree86 to create the TrueType font-dir
- more desktop target kernel work
- more desktop target kernel work
- Merged various patches from the ML: - Merged various patches from the ML:
- Sebastian Jaenicke: updated galeon and various tsa repository updates - Sebastian Jaenicke: updated galeon and various tsa repository updates
- Alejandro Mery: updated ccache-2.2, procps-3.1.6 and pkgconfig-0.15e - Alejandro Mery: updated ccache-2.2, procps-3.1.6 and pkgconfig-0.15e
@ -2878,7 +2878,7 @@
- various rene repository changed incl. renaming the microsoft fonts package, - various rene repository changed incl. renaming the microsoft fonts package,
adding the new bitstream-vera-fonts, ... adding the new bitstream-vera-fonts, ...
- fixed xfree86 to create the TrueType font-dir - fixed xfree86 to create the TrueType font-dir
- more desktop target kernel work
- more desktop target kernel work
- Merged various patches from the ML: - Merged various patches from the ML:
- Sebastian Jaenicke: updated galeon and various tsa repository updates - Sebastian Jaenicke: updated galeon and various tsa repository updates
- Alejandro Mery: updated ccache-2.2, procps-3.1.6 and pkgconfig-0.15e - Alejandro Mery: updated ccache-2.2, procps-3.1.6 and pkgconfig-0.15e

+ 1
- 1
doc/sde-wrapper.txt

@ -5,7 +5,7 @@
# Grab package files # Grab package files
# #
sde download <options> -all # Download every file from the tree sde download <options> -all # Download every file from the tree
[-cfg $config] $pkg [$pkg [...]]
[-cfg $config] $pkg [$pkg [...]]
# Downloads specific packages and their active extenders # Downloads specific packages and their active extenders
-cfg $config # Download all the files required by a given config -cfg $config # Download all the files required by a given config
-help # Shows some help -help # Shows some help

+ 3
- 3
etc/desc_format

@ -10,7 +10,7 @@ the other tags. "./scripts/Create-DescPatch" can help you here.
All tags marked with (*) are required. And should be present in every .desc All tags marked with (*) are required. And should be present in every .desc
file. file.
- Clifford and Rene
- Clifford and Rene
---- ----
@ -143,7 +143,7 @@ file.
Format: [SRC] tarball1 tarball2 Format: [SRC] tarball1 tarball2
This will enable build_this_package to build the content of more than This will enable build_this_package to build the content of more than
one tarball. one tarball.
NOTE: do not put the extension of the tarballs (e.g. tar.gz) into this
NOTE: do not put the extension of the tarballs (e.g. tar.gz) into this
tag, as it will be autodetected. tag, as it will be autodetected.
NOTE2: a pattern to match the needed tarball should be enough. NOTE2: a pattern to match the needed tarball should be enough.
(example: (example:
@ -151,6 +151,6 @@ file.
> [D] cksum mypkg-gfx-version2.tbz2 http://some.url.tld > [D] cksum mypkg-gfx-version2.tbz2 http://some.url.tld
> [D] cksum mypkg-data-version3.tar.bz2 http://some.url.tld > [D] cksum mypkg-data-version3.tar.bz2 http://some.url.tld
> [SRC] mypkg-version1 gfx > [SRC] mypkg-version1 gfx
This would run the whole build cycle with mypkg-version1.tar.bz2 and
This would run the whole build cycle with mypkg-version1.tar.bz2 and
mypkg-gfx-version2.tbz2 but not with mypkg-data-version3.tar.bz2. mypkg-gfx-version2.tbz2 but not with mypkg-data-version3.tar.bz2.

+ 3
- 3
etc/download.sed

@ -1,13 +1,13 @@
#!/bin/sed #!/bin/sed
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: etc/download.sed # Filename: etc/download.sed
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2005 - 2006 The T2 SDE Project # Copyright (C) 2005 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/core-functions.in

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/core-functions.in # Filename: lib/core-functions.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 23
- 23
lib/functions.in

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/functions.in # Filename: lib/functions.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -64,7 +64,7 @@ atstage() {
local x= local x=
for x; do for x; do
case "$x" in case "$x" in
toolchain)
toolchain)
[ $stagelevel -gt 0 ] || return 0 ;; [ $stagelevel -gt 0 ] || return 0 ;;
cross|crossbuild|crosscompile) cross|crossbuild|crosscompile)
[ $stagelevel -ne 1 ] || return 0 ;; [ $stagelevel -ne 1 ] || return 0 ;;
@ -142,7 +142,7 @@ hook_dump() {
for hook in ${!hookidx_*} ; do for hook in ${!hookidx_*} ; do
hook=${hook#hookidx_} hook=${hook#hookidx_}
echo ; echo "Contents of hook $hook:" echo ; echo "Contents of hook $hook:"
while read pri fnr ; do while read pri fnr ; do
echo ; echo " $pri ($fnr)" echo ; echo " $pri ($fnr)"
echo "${hook_functions[fnr]}" | sed 's,^, ,' echo "${hook_functions[fnr]}" | sed 's,^, ,'
@ -206,7 +206,7 @@ set_confopt() {
# bindir=/usr/bin # bindir=/usr/bin
eval "$x=`pkggetdir $x`" eval "$x=`pkggetdir $x`"
# --bindir=$root\$bindir # --bindir=$root\$bindir
confopt="$confopt --$x=$z\$$x"
confopt="$confopt --$x=$z\$$x"
done done
@ -261,7 +261,7 @@ function eval_config_command() {
EOT EOT
for x in $configcache; do for x in $configcache; do
echo "$x" echo "$x"
done
done
fi >> $config_cache fi >> $config_cache
grep -q '.--cache-file=' $configscript && grep -q '.--cache-file=' $configscript &&
@ -370,7 +370,7 @@ postflist_static_lib() {
deplib="`echo $deplib | sed "s,/lib$,/$libsub,g; s,/lib/,/$libsub/,g"`" deplib="`echo $deplib | sed "s,/lib$,/$libsub,g; s,/lib/,/$libsub/,g"`"
;; ;;
esac esac
fi
fi
case "$deplib" in case "$deplib" in
*TOOLCHAIN*|*BACKUP*|*$SDECFG_ID*) ;; *TOOLCHAIN*|*BACKUP*|*$SDECFG_ID*) ;;
@ -378,7 +378,7 @@ postflist_static_lib() {
dlibtmp=$dlibsnew ; var_remove dlibtmp ' ' "$deplib" dlibtmp=$dlibsnew ; var_remove dlibtmp ' ' "$deplib"
[ "$dlibtmp" = "$dlibsnew" ] && var_append dlibsnew ' ' "$deplib" [ "$dlibtmp" = "$dlibsnew" ] && var_append dlibsnew ' ' "$deplib"
;; ;;
esac esac
done done
@ -577,7 +577,7 @@ pkgprefix() {
if [ "$1" = "-t" ]; then if [ "$1" = "-t" ]; then
dotest=1; shift dotest=1; shift
fi fi
if [ $# -eq 2 ]; then if [ $# -eq 2 ]; then
type="$1"; shift type="$1"; shift
fi fi
@ -786,7 +786,7 @@ apply_patchfiles() {
} }
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# The automatic extraction of archive (prior to building) supports
# The automatic extraction of archive (prior to building) supports
# multiple archive types. For every archive type we have a separate # multiple archive types. For every archive type we have a separate
# func that knows how to extract the archive. However, every func # func that knows how to extract the archive. However, every func
# should deliver two file: untar.txt and xsrcdir.txt. # should deliver two file: untar.txt and xsrcdir.txt.
@ -797,13 +797,13 @@ apply_patchfiles() {
autoextract_tar_bz2() { autoextract_tar_bz2() {
echo "Extracting $xsrctar ($taropt) ... " echo "Extracting $xsrctar ($taropt) ... "
tar -v $taropt $1 > untar.txt
tar -v $taropt $1 > untar.txt
} }
autoextract_zip() { autoextract_zip() {
echo "Extracting $xsrctar ($zipopt) ... " echo "Extracting $xsrctar ($zipopt) ... "
unzip $zipopt $1 | sed 's,^.*/$,,' | unzip $zipopt $1 | sed 's,^.*/$,,' |
cut -f4 -d" " | grep -v "^$" > untar.txt
cut -f4 -d" " | grep -v "^$" > untar.txt
} }
# Main program for building a package # Main program for building a package
@ -842,13 +842,13 @@ build_this_package() {
# autoextraction to use. # autoextraction to use.
case "$xsrctar" in case "$xsrctar" in
*.zip) custextract="autoextract_zip" ;; *.zip) custextract="autoextract_zip" ;;
*) custextract="autoextract_tar_bz2" ;; # *.tar.bz2|*.tbz2|*.tbz
*) custextract="autoextract_tar_bz2" ;; # *.tar.bz2|*.tbz2|*.tbz
esac esac
fi fi
if [ -n "$custextract" ]; then if [ -n "$custextract" ]; then
# Do the actual extraction of the archive. # Do the actual extraction of the archive.
eval "$custextract $archdir/$xsrctar" eval "$custextract $archdir/$xsrctar"
cat untar.txt |
cat untar.txt |
sed 's,^\./,,' | cut -f1 -d/ | sed 's,^\./,,' | cut -f1 -d/ |
sort -u > xsrcdir.txt sort -u > xsrcdir.txt
fi fi
@ -887,10 +887,10 @@ build_this_package() {
cd $builddir/$xsrcdir cd $builddir/$xsrcdir
# Apply patches # Apply patches
#
#
if [ $autopatch = 1 ]; then if [ $autopatch = 1 ]; then
hook_eval prepatch hook_eval prepatch
apply_patchfiles
apply_patchfiles
hook_eval postpatch hook_eval postpatch
fi fi
@ -908,7 +908,7 @@ build_this_package() {
fi fi
done done
fi fi
if [ -z "$custmain" ]; then if [ -z "$custmain" ]; then
while [ ${buildloop:-1} -le ${buildloops:-1} ]; do while [ ${buildloop:-1} -le ${buildloops:-1} ]; do
[ "${buildloops:-1}" = "1" ] || echo "loop ${buildloop:-1} of ${buildloops:-1} for $xsrctar." [ "${buildloops:-1}" = "1" ] || echo "loop ${buildloop:-1} of ${buildloops:-1} for $xsrctar."
@ -934,7 +934,7 @@ build_this_package() {
fi fi
# Run configure scripts etc. # Run configure scripts etc.
# #
if [ $runconf = 1 ]; then
if [ $runconf = 1 ]; then
if [ -n "$( type -p $configscript )" -o $autogen = 1 ] if [ -n "$( type -p $configscript )" -o $autogen = 1 ]
then then
eval_config_command $( eval echo $confopt ) eval_config_command $( eval echo $confopt )
@ -1030,7 +1030,7 @@ build_this_package() {
fi fi
patchfiles="$saved_patchfiles" patchfiles="$saved_patchfiles"
done done
if [ "$rmemptydir" ]; then if [ "$rmemptydir" ]; then
rmdir $rmemptydir 2> /dev/null || true rmdir $rmemptydir 2> /dev/null || true
fi fi
@ -1049,12 +1049,12 @@ source_file() {
# '-' as $url prefix means, nomirrorable # '-' as $url prefix means, nomirrorable
[ "${url:0:1}" = "-" ] && mirror="local" [ "${url:0:1}" = "-" ] && mirror="local"
# inside Build-Pkg $archdir is set # inside Build-Pkg $archdir is set
if [ -n "$archdir" ]; then if [ -n "$archdir" ]; then
pre=$base/; file="$( bz2filename $file )" pre=$base/; file="$( bz2filename $file )"
fi fi
echo ${pre}download/${mirror}/${file:0:1}/$file echo ${pre}download/${mirror}/${file:0:1}/$file
} }
@ -1218,7 +1218,7 @@ build_package()
parse_desc $pkg parse_desc $pkg
# Erase positional parameters to prevent unintended parameter
# Erase positional parameters to prevent unintended parameter
# passing. We do not want to pass the current positional parameters # passing. We do not want to pass the current positional parameters
# to the loaded script. # to the loaded script.
set -- set --

+ 8
- 8
lib/init/formats/tail.in

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/formats/tail.in # Filename: lib/init/formats/tail.in
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -37,7 +37,7 @@ tail_read() {
output="$( grep -e "^$query" $file | cut -f$count- )" output="$( grep -e "^$query" $file | cut -f$count- )"
[ "$verbose" ] && echo "$output" [ "$verbose" ] && echo "$output"
grep -q -e "^$query" $file grep -q -e "^$query" $file
} }
@ -50,7 +50,7 @@ tail_install() {
runit) runit)
local servicedir=$( echo `eval echo $1` ) local servicedir=$( echo `eval echo $1` )
local runprefix= local runprefix=
mkdir -vp "$servicedir" mkdir -vp "$servicedir"
rm -f /tmp/tail.$$ rm -f /tmp/tail.$$
@ -108,7 +108,7 @@ tail_install() {
# #
if tail_read -q $tailfile log; then if tail_read -q $tailfile log; then
mkdir -vp "$servicedir/log/main" mkdir -vp "$servicedir/log/main"
if [ -z "$logdir" ]; then if [ -z "$logdir" ]; then
if [ "${localstatedir%$pkg}" != "$localstatedir" ]; then if [ "${localstatedir%$pkg}" != "$localstatedir" ]; then
logdir=$localstatedir/log logdir=$localstatedir/log
@ -117,7 +117,7 @@ tail_install() {
fi fi
fi fi
z=
z=
for x in `tail_read $tailfile log | cut -f1 | sort -u`; do for x in `tail_read $tailfile log | cut -f1 | sort -u`; do
echo "TAIL: ./log/$x" echo "TAIL: ./log/$x"
mkdir -vp $root/$logdir/$x mkdir -vp $root/$logdir/$x
@ -138,7 +138,7 @@ tail_install() {
EOT EOT
chmod +x "$servicedir/log/run" chmod +x "$servicedir/log/run"
fi fi
;; ;;
*) *)
abort "tail_install: unknown style '$style' for $tailfile." abort "tail_install: unknown style '$style' for $tailfile."

+ 3
- 3
lib/init/install_cron.in

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/install_cron.in # Filename: lib/init/install_cron.in
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/init/install_desktop.in

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/install_desktop.in # Filename: lib/init/install_desktop.in
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/init/install_init.in

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/install_init.in # Filename: lib/init/install_init.in
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/init/install_postinstall.in

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/install_postinstall.in # Filename: lib/init/install_postinstall.in
# Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/init/parse-config

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/init/parse-config # Filename: lib/init/parse-config
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/jailing/config.hlp

@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: misc/jailing/config.hlp # T2 SDE: misc/jailing/config.hlp
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/jailing/config.in

@ -1,13 +1,13 @@
# #
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: misc/jailing/config.in # T2 SDE: misc/jailing/config.in
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 6
- 6
lib/jailing/dbmail-db-header-path.patch

@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: misc/jailing/dbmail-db-header-path.patch # T2 SDE: misc/jailing/dbmail-db-header-path.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This patch file is dual-licensed. It is available under the license the # This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license # patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
@ -24,12 +24,12 @@
- mysqlheadername="$withval" - mysqlheadername="$withval"
+ mysqlheadername="$withval/include/mysql" + mysqlheadername="$withval/include/mysql"
fi fi
# Check whether --with-pgsql or --without-pgsql was given. # Check whether --with-pgsql or --without-pgsql was given.
if test "${with_pgsql+set}" = set; then if test "${with_pgsql+set}" = set; then
withval="$with_pgsql" withval="$with_pgsql"
- pgsqlheadername="$withval" - pgsqlheadername="$withval"
+ pgsqlheadername="$withval/include" + pgsqlheadername="$withval/include"
fi fi

+ 8
- 8
lib/jailing/package-functions

@ -1,37 +1,37 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing # Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
#
# ROCK Linux: rock-src/misc/jailing/package-functions # ROCK Linux: rock-src/misc/jailing/package-functions
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public # (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING. # License can be found at Documentation/COPYING.
#
#
# Many people helped and are helping developing ROCK Linux. Please # Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details. # file for details.
#
#
# --- ROCK-COPYRIGHT-NOTE-END --- # --- ROCK-COPYRIGHT-NOTE-END ---
jail_pkg_apache_postmake() { jail_pkg_apache_postmake() {
jail_ensure_users http jail_ensure_users http
### Updates paths in $root/$jail/$datadir/build/config_vars.mk ### Updates paths in $root/$jail/$datadir/build/config_vars.mk
echo "Updateing paths in $root/$jail/$datadir/build/config_vars.mk" echo "Updateing paths in $root/$jail/$datadir/build/config_vars.mk"
tmp=`mktemp` tmp=`mktemp`
# A copy of original config_vars.mk is left for reference # A copy of original config_vars.mk is left for reference
cp $root/$jail/$datadir/build/config_vars.mk \ cp $root/$jail/$datadir/build/config_vars.mk \
$root/$jail/$datadir/build/config_vars.mk.orig $root/$jail/$datadir/build/config_vars.mk.orig
cp -f $root/$jail/$datadir/build/config_vars.mk $tmp cp -f $root/$jail/$datadir/build/config_vars.mk $tmp
# s|$base/$builddir/httpd-$ver|/$jail/usr|; is repeated many times # s|$base/$builddir/httpd-$ver|/$jail/usr|; is repeated many times
@ -51,7 +51,7 @@ jail_pkg_apache_postmake() {
### END Updates paths in $root/$jail/$datadir/build/config_vars.mk ### END Updates paths in $root/$jail/$datadir/build/config_vars.mk
### Updates paths in $root/$jail/$sbindir/apxs ### Updates paths in $root/$jail/$sbindir/apxs
echo "Updateing paths in $root/$jail/$sbindir/apxs" echo "Updateing paths in $root/$jail/$sbindir/apxs"
cp -f $root/$jail/$sbindir/apxs $tmp cp -f $root/$jail/$sbindir/apxs $tmp
sed "s|/usr/share/build|/$jail/$datadir/build|" < $tmp \ sed "s|/usr/share/build|/$jail/$datadir/build|" < $tmp \

+ 5
- 5
lib/jailing/parse-config

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/jailing/parse-config # Filename: lib/jailing/parse-config
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -75,7 +75,7 @@ jail_samejail() {
if [ "${SDECFG_JAILING}" = 1 ] ; then if [ "${SDECFG_JAILING}" = 1 ] ; then
[ "$pkg" = php ] && jail_samejail php apache [ "$pkg" = php ] && jail_samejail php apache
[ "$pkg" = subversion ] && jail_samejail subversion apache [ "$pkg" = subversion ] && jail_samejail subversion apache
if eval "[ \"\${SDECFG_JAILING_$pkg}\" = 1 ]" ; then if eval "[ \"\${SDECFG_JAILING_$pkg}\" = 1 ]" ; then
. $base/lib/jailing/jail-functions . $base/lib/jailing/jail-functions
. $base/lib/jailing/package-functions . $base/lib/jailing/package-functions
@ -85,7 +85,7 @@ if [ "${SDECFG_JAILING}" = 1 ] ; then
eval "export jail=\"\${SDECFG_JAILDIR_$pkg}\"" eval "export jail=\"\${SDECFG_JAILDIR_$pkg}\""
case "$pkg" in case "$pkg" in
# Setting destvar
# Setting destvar
postfix) destvar='install_root' ;; postfix) destvar='install_root' ;;
php) destvar='INSTALL_ROOT' ;; php) destvar='INSTALL_ROOT' ;;
*) destvar='DESTDIR' ;; *) destvar='DESTDIR' ;;

+ 3
- 3
lib/jailing/postsysfiles.in

@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: misc/jailing/postsysfiles.in # T2 SDE: misc/jailing/postsysfiles.in
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/libsde.in

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/libsde.in # Filename: lib/libsde.in
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2007 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 7
- 7
lib/lua/lzlib/lzlib.c

@ -1,13 +1,13 @@
/* /*
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/lua/lzlib/lzlib.c * Filename: lib/lua/lzlib/lzlib.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -27,7 +27,7 @@
#define ZLIB_HANDLE "gzFile" #define ZLIB_HANDLE "gzFile"
// ------------------- helper functions ------------------------
// ------------------- helper functions ------------------------
// pushes gzFile operation result string on lua stack // pushes gzFile operation result string on lua stack
@ -84,7 +84,7 @@ size_t content_buffer_length = 0;
size_t content_length = 0; size_t content_length = 0;
static inline void ResetBuffer () static inline void ResetBuffer ()
{
{
content_length = 0; content_length = 0;
} }
@ -123,7 +123,7 @@ static inline int BufferFill ()
return content_length; return content_length;
} }
static inline int BufferFree ()
static inline int BufferFree ()
{ {
return (content_buffer_length - content_length); return (content_buffer_length - content_length);
} }
@ -210,7 +210,7 @@ static int __gz_lines_iterator (lua_State *L)
if (ch == '\n' || BufferFill () > 0) { if (ch == '\n' || BufferFill () > 0) {
if (ch == '\n') if (ch == '\n')
lua_pushstring (L, FinishBuffer ()); lua_pushstring (L, FinishBuffer ());
return 1; return 1;
} else { } else {

+ 4
- 4
lib/lua/lzlib/zlibtest.lua

@ -1,12 +1,12 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/lzlib/zlibtest.lua -- Filename: lib/lua/lzlib/zlibtest.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -23,7 +23,7 @@ if not zf then -- failed to open file, print error
else else
lines = zf:lines(); -- obtain line iterator lines = zf:lines(); -- obtain line iterator
for x in lines do -- output contents
for x in lines do -- output contents
print (x); print (x);
end end

+ 4
- 4
lib/lua/parse-db.lua

@ -1,12 +1,12 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/parse-db.lua -- Filename: lib/lua/parse-db.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -77,7 +77,7 @@ else
if lines() ~= "\004" then -- separator line if lines() ~= "\004" then -- separator line
print ("terminating line missing\n"); print ("terminating line missing\n");
end end
packages[pkgname] = pkg_data; packages[pkgname] = pkg_data;
end end
until pkgname == nil; until pkgname == nil;

+ 4
- 4
lib/lua/parse-desc.lua

@ -1,13 +1,13 @@
#!/usr/bin/env lua #!/usr/bin/env lua
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/parse-desc.lua -- Filename: lib/lua/parse-desc.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -15,7 +15,7 @@
-- --- SDE-COPYRIGHT-NOTE-END --- -- --- SDE-COPYRIGHT-NOTE-END ---
-- try this: -- try this:
--
--
-- this file looks quite complicated already, but a comparsion to grep might help: -- this file looks quite complicated already, but a comparsion to grep might help:
-- --
-- time lua lib/lua/parse-desc.lua package/base/*/*.desc > /dev/null -- time lua lib/lua/parse-desc.lua package/base/*/*.desc > /dev/null

+ 5
- 5
lib/lua/sde/desc.lua

@ -1,13 +1,13 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/sde/desc.lua -- Filename: lib/lua/sde/desc.lua
-- Copyright (C) 2006 - 2008 The OpenSDE Project -- Copyright (C) 2006 - 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
-- Copyright (C) 2005 - 2006 Juergen "George" Sawinski -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -37,7 +37,7 @@ function desc.parse(iter)
local retval = {} local retval = {}
-- FIXME: Perhaps we'll gain some performance by not reading -- FIXME: Perhaps we'll gain some performance by not reading
-- line by line
-- line by line
for line in io.open(iter):lines() do for line in io.open(iter):lines() do
local tag,cnt local tag,cnt
@ -77,7 +77,7 @@ for line in io.open("etc/desc_format"):lines() do
tag = string.lower(tag) tag = string.lower(tag)
-- sort into __format__ -- sort into __format__
for t in string.gfind(line,"([[][^]]*[]])") do
for t in string.gfind(line,"([[][^]]*[]])") do
desc.__format__[t] = { name = tag; required = required } desc.__format__[t] = { name = tag; required = required }
end end
end end

+ 20
- 20
lib/lua/sde/getopt.lua

@ -1,13 +1,13 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/sde/getopt.lua -- Filename: lib/lua/sde/getopt.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
-- Copyright (C) 2005 - 2006 Juergen "George" Sawinski -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -23,29 +23,29 @@
-- Parses the "arg-list" according to "option-definition" and -- Parses the "arg-list" according to "option-definition" and
-- returns the parsed options "opts", additional arguments "args" and -- returns the parsed options "opts", additional arguments "args" and
-- possibly an error. -- possibly an error.
--
--
-- Option definition format: -- Option definition format:
-- key Option key (e.g. key = "help") -- key Option key (e.g. key = "help")
-- option String or list of options (e.g. option = {"-h", "--help"}) -- option String or list of options (e.g. option = {"-h", "--help"})
-- default Default value (e.g. default = false) -- default Default value (e.g. default = false)
-- argument This option has no argument (ARG.none), a required -- argument This option has no argument (ARG.none), a required
-- argument (ARG.required) or an optional argument (ARG.optional) -- argument (ARG.required) or an optional argument (ARG.optional)
-- flag The option is flagged:
-- flag The option is flagged:
-- number (OPT.number) -- number (OPT.number)
-- incremental (OPT.incremental) -- incremental (OPT.incremental)
-- Example: see below -- Example: see below
ARG = {
none = 0,
ARG = {
none = 0,
required = 1, required = 1,
optional = 2
optional = 2
} }
OPT = { OPT = {
none = 0, none = 0,
string = 0, string = 0,
number = 1, number = 1,
--boolean = 2,
--boolean = 2,
incremental = 10, incremental = 10,
} }
@ -56,17 +56,17 @@ function getopt(args,def)
-- first pass: defaults -- first pass: defaults
for _,d in pairs(def) do for _,d in pairs(def) do
if d.default ~= nil then
if d.default ~= nil then
opt[d.key] = d.default opt[d.key] = d.default
end end
end end
-- Second pass: parse arguments -- Second pass: parse arguments
local i=1
local i=1
repeat repeat
for _,d in pairs(def) do for _,d in pairs(def) do
local found = false local found = false
-- FIXME is there some shorter version for this: -- FIXME is there some shorter version for this:
if type(d.option) == "string" then if type(d.option) == "string" then
if d.option == args[i] then found=true end if d.option == args[i] then found=true end
@ -77,31 +77,31 @@ function getopt(args,def)
end end
end end
end end
-- process option and arguments -- process option and arguments
if found then if found then
local val = true local val = true
local nextisopt = false local nextisopt = false
local havearg = false local havearg = false
-- check if next is an argument (not option) -- check if next is an argument (not option)
if args[i+1] and string.sub(args[i+1],1,1) == "-" then if args[i+1] and string.sub(args[i+1],1,1) == "-" then
nextisopt = true nextisopt = true
end end
-- option argument ? -- option argument ?
if nextisopt and d.argument == ARG.required then if nextisopt and d.argument == ARG.required then
return nil, nil, "Missing option argument for `" .. args[i] .. "'" return nil, nil, "Missing option argument for `" .. args[i] .. "'"
end end
if not nextisopt and if not nextisopt and
(d.argument == ARG.required
(d.argument == ARG.required
or d.argument == ARG.optional) then or d.argument == ARG.optional) then
args[i] = nil
args[i] = nil
i = i+1 i = i+1
val = args[i] val = args[i]
havearg = true havearg = true
end end

+ 6
- 6
lib/lua/sde/hooks.lua

@ -1,13 +1,13 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/sde/hooks.lua -- Filename: lib/lua/sde/hooks.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
-- Copyright (C) 2005 - 2006 Juergen "George" Sawinski -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the
@ -37,9 +37,9 @@
-- Run a specific hook level -- Run a specific hook level
-- --
-- Access without hook level: -- Access without hook level:
-- h:add(function-or-string)
-- h:add(function-or-string)
-- Equivalent to h[5]:add(function-or-string) -- Equivalent to h[5]:add(function-or-string)
--
--
-- h:set(function-or-string) -- h:set(function-or-string)
-- Equivalent to h[5]:set(function-or-string), however, clears -- Equivalent to h[5]:set(function-or-string), however, clears
-- all other levels -- all other levels
@ -106,7 +106,7 @@ function __hook.add(h, data)
local f = loadstring(data) local f = loadstring(data)
table.insert(h.hooks, f) table.insert(h.hooks, f)
else else
assert(type(data) == "function",
assert(type(data) == "function",
"function or string expected in hook.add(table, pos, function-or-string)") "function or string expected in hook.add(table, pos, function-or-string)")
end end
end end

+ 3
- 3
lib/lua/sde/pkgdb.lua

@ -1,13 +1,13 @@
-- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- --- SDE-COPYRIGHT-NOTE-BEGIN ---
-- This copyright note is auto-generated by ./scripts/Create-CopyPatch. -- This copyright note is auto-generated by ./scripts/Create-CopyPatch.
--
--
-- Filename: lib/lua/sde/pkgdb.lua -- Filename: lib/lua/sde/pkgdb.lua
-- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2008 The OpenSDE Project
-- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project
-- Copyright (C) 2005 - 2006 Valentin Ziegler, Juergen "George" Sawinski -- Copyright (C) 2005 - 2006 Valentin Ziegler, Juergen "George" Sawinski
--
--
-- More information can be found in the files COPYING and README. -- More information can be found in the files COPYING and README.
--
--
-- This program is free software; you can redistribute it and/or modify -- 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 -- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; version 2 of the License. A copy of the -- the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/AuditBuild.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/AuditBuild.sh # Filename: lib/misc/AuditBuild.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/GenDepGraph.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/GenDepGraph.sh # Filename: lib/misc/GenDepGraph.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/PackBuildInfo.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/PackBuildInfo.sh # Filename: lib/misc/PackBuildInfo.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 4
- 4
lib/misc/RegressionsReport.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/RegressionsReport.sh # Filename: lib/misc/RegressionsReport.sh
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -15,7 +15,7 @@
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
config=default config=default
TARGET=regressions TARGET=regressions
revision=`svn info | sed -n 's,^Revision: \(.*\),\1,p'`
revision=`svn info | sed -n 's,^Revision: \(.*\),\1,p'`
if [ "$1" = "-cfg" ]; then if [ "$1" = "-cfg" ]; then
config="$2"; shift 2 config="$2"; shift 2

+ 3
- 3
lib/misc/adddownload.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/adddownload.sh # Filename: lib/misc/adddownload.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/apply-patch.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/apply-patch.sh # Filename: lib/misc/apply-patch.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 14
- 14
lib/misc/bash-xterm.patch

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/bash-xterm.patch # Filename: lib/misc/bash-xterm.patch
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This patch file is dual-licensed. It is available under the license the # This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license # patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
@ -42,7 +42,7 @@ diff -ruN bash-2.04-orig/builtins/set.def bash-2.04/builtins/set.def
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
# include "../bashhist.h" # include "../bashhist.h"
#endif #endif
-extern int interactive; -extern int interactive;
+extern int interactive, xterm_mode; +extern int interactive, xterm_mode;
extern int noclobber, posixly_correct, ignoreeof, eof_encountered_limit; extern int noclobber, posixly_correct, ignoreeof, eof_encountered_limit;
@ -63,14 +63,14 @@ diff -ruN bash-2.04-orig/builtins/set.def bash-2.04/builtins/set.def
+ { "xterm", &xterm_mode, (Function *)NULL, (Function *)NULL }, + { "xterm", &xterm_mode, (Function *)NULL, (Function *)NULL },
{ (char *)NULL, (int *)NULL } { (char *)NULL, (int *)NULL }
}; };
diff -ruN bash-2.04-orig/execute_cmd.c bash-2.04/execute_cmd.c diff -ruN bash-2.04-orig/execute_cmd.c bash-2.04/execute_cmd.c
--- bash-2.04-orig/execute_cmd.c Tue Jan 25 17:29:11 2000 --- bash-2.04-orig/execute_cmd.c Tue Jan 25 17:29:11 2000
+++ bash-2.04/execute_cmd.c Sun Apr 8 12:49:23 2001 +++ bash-2.04/execute_cmd.c Sun Apr 8 12:49:23 2001
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
# include "bashhist.h" # include "bashhist.h"
#endif #endif
-extern int posixly_correct; -extern int posixly_correct;
+extern int posixly_correct, xterm_mode; +extern int posixly_correct, xterm_mode;
extern int executing, breaking, continuing, loop_level; extern int executing, breaking, continuing, loop_level;
@ -90,7 +90,7 @@ diff -ruN bash-2.04-orig/execute_cmd.c bash-2.04/execute_cmd.c
+ the_printed_command); + the_printed_command);
+ FREE(txt); fflush(stderr); + FREE(txt); fflush(stderr);
+ } + }
first_word_quoted = first_word_quoted =
simple_command->words ? (simple_command->words->word->flags & W_QUOTED): 0; simple_command->words ? (simple_command->words->word->flags & W_QUOTED): 0;
diff -ruN bash-2.04-orig/flags.c bash-2.04/flags.c diff -ruN bash-2.04-orig/flags.c bash-2.04/flags.c
@ -99,7 +99,7 @@ diff -ruN bash-2.04-orig/flags.c bash-2.04/flags.c
@@ -147,6 +147,11 @@ @@ -147,6 +147,11 @@
int brace_expansion = 1; int brace_expansion = 1;
#endif #endif
+/* Non-zero means that the shell prints xterm escape codes for creating +/* Non-zero means that the shell prints xterm escape codes for creating
+ a new title text before printing the promt and before exetucing a + a new title text before printing the promt and before exetucing a
+ command. */ + command. */
@ -116,7 +116,7 @@ diff -ruN bash-2.04-orig/parse.y bash-2.04/parse.y
extern int bash_input_fd_changed; extern int bash_input_fd_changed;
#endif #endif
+extern int xterm_mode; +extern int xterm_mode;
extern int errno; extern int errno;
/* **************************************************************** */ /* **************************************************************** */
@@ -153,6 +154,7 @@ @@ -153,6 +154,7 @@
@ -124,31 +124,31 @@ diff -ruN bash-2.04-orig/parse.y bash-2.04/parse.y
editing is turned off. Analogous to current_readline_prompt. */ editing is turned off. Analogous to current_readline_prompt. */
static char *current_decoded_prompt; static char *current_decoded_prompt;
+static char *current_decoded_ps1_prompt; +static char *current_decoded_ps1_prompt;
/* The number of lines read from input while creating the current command. */ /* The number of lines read from input while creating the current command. */
int current_command_line_count; int current_command_line_count;
@@ -975,6 +977,10 @@ @@ -975,6 +977,10 @@
interrupt_immediately++; interrupt_immediately++;
} }
+ if (xterm_mode) fprintf(stderr, "\033]0;%s\007", + if (xterm_mode) fprintf(stderr, "\033]0;%s\007",
+ current_decoded_ps1_prompt ? + current_decoded_ps1_prompt ?
+ current_decoded_ps1_prompt : "bash"); + current_decoded_ps1_prompt : "bash");
+ +
current_readline_line = readline (current_readline_prompt ? current_readline_line = readline (current_readline_prompt ?
current_readline_prompt : ""); current_readline_prompt : "");
@@ -3421,6 +3427,10 @@ @@ -3421,6 +3427,10 @@
ps1_prompt = get_string_value ("PS1"); ps1_prompt = get_string_value ("PS1");
ps2_prompt = get_string_value ("PS2"); ps2_prompt = get_string_value ("PS2");
+ FREE (current_decoded_ps1_prompt); + FREE (current_decoded_ps1_prompt);
+ current_decoded_ps1_prompt = ps1_prompt ? + current_decoded_ps1_prompt = ps1_prompt ?
+ decode_prompt_string (ps1_prompt) : (char *)NULL; + decode_prompt_string (ps1_prompt) : (char *)NULL;
+ +
if (!prompt_string_pointer) if (!prompt_string_pointer)
prompt_string_pointer = &ps1_prompt; prompt_string_pointer = &ps1_prompt;
@@ -3468,6 +3478,8 @@ @@ -3468,6 +3478,8 @@
static void static void
print_prompt () print_prompt ()

+ 4
- 4
lib/misc/cacheinjector.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/cacheinjector.sh # Filename: lib/misc/cacheinjector.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -27,7 +27,7 @@ fi
eval `grep SDECFG_ID= config/$config/config` eval `grep SDECFG_ID= config/$config/config`
FILTER="sed -n -e 's|\[SIZE\].*MB, \\([0-9].*\\)|[SIZE] \1|p' -e '/\\(gawk\|patch\\)/ d;' -e '/^\[DEP\]/ p;'" FILTER="sed -n -e 's|\[SIZE\].*MB, \\([0-9].*\\)|[SIZE] \1|p' -e '/\\(gawk\|patch\\)/ d;' -e '/^\[DEP\]/ p;'"
echo package/*/*/ | tr ' ' '\n' |
echo package/*/*/ | tr ' ' '\n' |
sed -e "s,^\(.*\)/\(.*\)/\(.*\)/,\3 build/$SDECFG_ID/var/adm/cache/\3 \1/\2/\3/\3.cache," | sed -e "s,^\(.*\)/\(.*\)/\(.*\)/,\3 build/$SDECFG_ID/var/adm/cache/\3 \1/\2/\3/\3.cache," |
while read pkg new original; do while read pkg new original; do
if [ -f $new ]; then if [ -f $new ]; then

+ 7
- 7
lib/misc/catedit.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/catedit.sh # Filename: lib/misc/catedit.sh
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -23,7 +23,7 @@
set -e set -e
item=''
item=''
tmp=$( mktemp ) tmp=$( mktemp )
if [ $(dialog --version 2>&1| grep -c "0.9") -eq 0 ]; then if [ $(dialog --version 2>&1| grep -c "0.9") -eq 0 ]; then
@ -53,7 +53,7 @@ do
for file in $files; do for file in $files; do
[[ $file = */$item.desc ]] && break [[ $file = */$item.desc ]] && break
done done
(for category in $(awk '/^[^# ]/ {print $1}' < etc/categories ); do (for category in $(awk '/^[^# ]/ {print $1}' < etc/categories ); do
echo -n $category $category echo -n $category $category
if [ -n "$(grep "^\[C\].*$category" $file )" ] if [ -n "$(grep "^\[C\].*$category" $file )" ]
@ -67,11 +67,11 @@ do
42 80 35 $(cat $tmp) 2> $tmp 42 80 35 $(cat $tmp) 2> $tmp
value=$( cat $tmp | sed -e 's/"//g' -e 's/ $//' ) value=$( cat $tmp | sed -e 's/"//g' -e 's/ $//' )
if [ "$value" ] ; then
if [ "$value" ] ; then
cat $file | sed "s,^\[C\] .*,\[C\] $value,g" > $tmp cat $file | sed "s,^\[C\] .*,\[C\] $value,g" > $tmp
cat $tmp > $file cat $tmp > $file
#grep -v '^\[C\]' "$file" > $tmp #grep -v '^\[C\]' "$file" > $tmp
#echo -e '\n'"[C] $value" >> $tmp
#echo -e '\n'"[C] $value" >> $tmp
#./scripts/Create-DescPatch $item | patch -p1 #./scripts/Create-DescPatch $item | patch -p1
fi fi
done done

+ 4
- 4
lib/misc/ccat.c

@ -2,14 +2,14 @@
* *
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/ccat.c * Filename: lib/misc/ccat.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
int main(int argc) { int main(int argc) {
char s1[]="................................" char s1[]="................................"
"................................"; "................................";

+ 9
- 9
lib/misc/cdromchk.c

@ -2,14 +2,14 @@
* *
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/cdromchk.c * Filename: lib/misc/cdromchk.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -31,26 +31,26 @@ int main(int argc, char ** argv) {
char buf2[4096]; char buf2[4096];
int rc1,rc2,rc3; int rc1,rc2,rc3;
int c1=0,c2=0; int c1=0,c2=0;
if (argc != 3) { if (argc != 3) {
fprintf(stderr,"Usage: %s <cdrom> <iso-file>\n",argv[0]); fprintf(stderr,"Usage: %s <cdrom> <iso-file>\n",argv[0]);
return 1; return 1;
} }
fprintf(stderr,"Checking CD-ROM ..."); fprintf(stderr,"Checking CD-ROM ...");
if ( (cdrom=open(argv[1],O_RDONLY|O_SYNC)) == 0 ) { if ( (cdrom=open(argv[1],O_RDONLY|O_SYNC)) == 0 ) {
fprintf(stderr,"\n%s: Can't open %s: %s\n", fprintf(stderr,"\n%s: Can't open %s: %s\n",
argv[0],argv[1],strerror(errno)); argv[0],argv[1],strerror(errno));
return 1; return 1;
} }
if ( (file=open(argv[2],O_RDONLY)) == 0 ) { if ( (file=open(argv[2],O_RDONLY)) == 0 ) {
fprintf(stderr,"\n%s: Can't open %s: %s\n", fprintf(stderr,"\n%s: Can't open %s: %s\n",
argv[0],argv[2],strerror(errno)); argv[0],argv[2],strerror(errno));
return 1; return 1;
} }
while ( (rc1=read(file,buf1,4096)) > 0 ) { while ( (rc1=read(file,buf1,4096)) > 0 ) {
for (rc2=0; rc2 < rc1; rc2+=rc3) { for (rc2=0; rc2 < rc1; rc2+=rc3) {
rc3=read(cdrom,buf2+rc2,rc1-rc2); rc3=read(cdrom,buf2+rc2,rc1-rc2);
@ -83,7 +83,7 @@ int main(int argc, char ** argv) {
argv[0],strerror(errno)); argv[0],strerror(errno));
return 1; return 1;
} }
fprintf(stderr," OK (%d MB).\n",c2/1048576); fprintf(stderr," OK (%d MB).\n",c2/1048576);
return 0; return 0;
} }

+ 11
- 11
lib/misc/compare.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/compare.sh # Filename: lib/misc/compare.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -40,7 +40,7 @@ function show_usage() {
echo echo
echo " -p: show patch to turn \$source into \$target" echo " -p: show patch to turn \$source into \$target"
echo " -P: ignore [P]s of .desc files on patches" echo " -P: ignore [P]s of .desc files on patches"
echo " -S: ignore spaces on patches"
echo " -S: ignore spaces on patches"
} }
# TODO: it would be great to port it to "-n <n>" instead of -3 # TODO: it would be great to port it to "-n <n>" instead of -3
@ -59,9 +59,9 @@ while [ $# -gt 0 ]; do
targets="$3 $4" targets="$3 $4"
shift 3 ;; shift 3 ;;
-repository)
-repository)
shift shift
repositories="$*"; set --
repositories="$*"; set --
;; ;;
*) if [ "$targets" ]; then *) if [ "$targets" ]; then
packages="$*"; set -- packages="$*"; set --
@ -73,13 +73,13 @@ while [ $# -gt 0 ]; do
esac esac
shift shift
done done
function remove_header() { function remove_header() {
# thanks you blindcoder :) # thanks you blindcoder :)
# #
local here=0 count=1 local here=0 count=1
while read line ; do while read line ; do
count=$(( ${count} + 1 ))
count=$(( ${count} + 1 ))
[ "${line//COPYRIGHT-NOTE-END/}" != "${line}" ] && here=${count} [ "${line//COPYRIGHT-NOTE-END/}" != "${line}" ] && here=${count}
done < $1 done < $1
tail -n +${here} $1 tail -n +${here} $1
@ -212,7 +212,7 @@ function compare_package() {
missing=1 missing=1
fi fi
done done
tgtver="${tgtver#:}" tgtver="${tgtver#:}"
tgtstatus="${tgtstatus#:}" tgtstatus="${tgtstatus#:}"
tgtsize="${tgtsize#:}" tgtsize="${tgtsize#:}"
@ -234,13 +234,13 @@ function compare_package() {
else else
version="$srcver -> $tgtver" version="$srcver -> $tgtver"
fi fi
if [ $equalstatus -eq 1 ]; then if [ $equalstatus -eq 1 ]; then
status="$srcstatus" status="$srcstatus"
else else
status="$srcstatus -> $tgtstatus" status="$srcstatus -> $tgtstatus"
fi fi
# acording to verbosity level, what info should i show? # acording to verbosity level, what info should i show?
# #
if [ $verbose -eq 0 ]; then if [ $verbose -eq 0 ]; then

+ 4
- 4
lib/misc/compare_builddirs.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/compare_builddirs.sh # Filename: lib/misc/compare_builddirs.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2005 - 2006 The T2 SDE Project # Copyright (C) 2005 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -46,7 +46,7 @@ compare_builddirs() {
fi fi
[ -n "$cfg0" -a -n "$cfg1" ] || exit 1 [ -n "$cfg0" -a -n "$cfg1" ] || exit 1
# package list # package list
#diff -U1 "$cfg0/packages" "$cfg1/packages" #diff -U1 "$cfg0/packages" "$cfg1/packages"

+ 6
- 6
lib/misc/copypackage.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/copypackage.sh # Filename: lib/misc/copypackage.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -35,8 +35,8 @@ cppkg() {
fi fi
echo "$pkg: $from -> $to" echo "$pkg: $from -> $to"
cut -d' ' -f2- $from/var/adm/flists/$pkg |
tar -C "$from/" --ignore-failed-read --no-recursion -T - -c -O |
cut -d' ' -f2- $from/var/adm/flists/$pkg |
tar -C "$from/" --ignore-failed-read --no-recursion -T - -c -O |
tar -C "$to" --same-owner --preserve -xvf - tar -C "$to" --same-owner --preserve -xvf -
cp -v $from/var/adm/logs/*-$pkg.{err,out,log} $to/var/adm/logs/ 2> /dev/null cp -v $from/var/adm/logs/*-$pkg.{err,out,log} $to/var/adm/logs/ 2> /dev/null
else else
@ -45,7 +45,7 @@ cppkg() {
} }
source="$1"; shift source="$1"; shift
target="$1"; shift
target="$1"; shift
if [ $# -gt 0 -a -f ./config/$source/config -a -f ./config/$target/config -a "$source" != "$target" ]; then if [ $# -gt 0 -a -f ./config/$source/config -a -f ./config/$target/config -a "$source" != "$target" ]; then
SDECFG_ID= SDECFG_ID=

+ 3
- 3
lib/misc/cvsaddrm.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/cvsaddrm.sh # Filename: lib/misc/cvsaddrm.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/cvsmv.sh

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/cvsmv.sh # Filename: lib/misc/cvsmv.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 4
- 4
lib/misc/findorphans.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/findorphans.sh # Filename: lib/misc/findorphans.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -49,7 +49,7 @@ fi
if [ ! -d "$root/var/adm/flists" ]; then if [ ! -d "$root/var/adm/flists" ]; then
echo "ERROR: '$root' is not a valid OpenSDE box/sandbox root" echo "ERROR: '$root' is not a valid OpenSDE box/sandbox root"
exit 3 exit 3
fi
fi
flists=$( cd "$root"; echo var/adm/flists/* ) flists=$( cd "$root"; echo var/adm/flists/* )
realroot=$( cd "$root"; pwd ) realroot=$( cd "$root"; pwd )

+ 3
- 3
lib/misc/fixmaintainer.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/fixmaintainer.sh # Filename: lib/misc/fixmaintainer.sh
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/getdefs.sh

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/getdefs.sh # Filename: lib/misc/getdefs.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/hello.c

@ -2,14 +2,14 @@
* *
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/hello.c * Filename: lib/misc/hello.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the

+ 5
- 5
lib/misc/hello.cc

@ -1,25 +1,25 @@
// Hello World in C++ (by Clifford - revisited for post C++ 8x by Rene Rebe) // Hello World in C++ (by Clifford - revisited for post C++ 8x by Rene Rebe)
// //
// --- ROCK-COPYRIGHT-NOTE-BEGIN --- // --- ROCK-COPYRIGHT-NOTE-BEGIN ---
//
//
// This copyright note is auto-generated by ./scripts/Create-CopyPatch. // This copyright note is auto-generated by ./scripts/Create-CopyPatch.
// Please add additional copyright information _after_ the line containing // Please add additional copyright information _after_ the line containing
// the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by // the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
// the ./scripts/Create-CopyPatch script. Do not edit this copyright text! // the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
//
//
// ROCK Linux: rock-src/misc/archive/hello.cc // ROCK Linux: rock-src/misc/archive/hello.cc
// Copyright (C) 1998 - 2003 Clifford Wolf // Copyright (C) 1998 - 2003 Clifford Wolf
//
//
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or // the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. A copy of the GNU General Public // (at your option) any later version. A copy of the GNU General Public
// License can be found at Documentation/COPYING. // License can be found at Documentation/COPYING.
//
//
// Many people helped and are helping developing ROCK Linux. Please // Many people helped and are helping developing ROCK Linux. Please
// have a look at http://www.rocklinux.org/ and the Documentation/TEAM // have a look at http://www.rocklinux.org/ and the Documentation/TEAM
// file for details. // file for details.
//
//
// --- ROCK-COPYRIGHT-NOTE-END --- // --- ROCK-COPYRIGHT-NOTE-END ---
#include <iostream> #include <iostream>

+ 2
- 2
lib/misc/hello.cs

@ -3,9 +3,9 @@
// Run with the Mono Interpreter 'mint hello.exe' or // Run with the Mono Interpreter 'mint hello.exe' or
// with the Mono JIT Compiler 'mono hello.exe'. // with the Mono JIT Compiler 'mono hello.exe'.
class Hello
class Hello
{ {
static void Main()
static void Main()
{ {
System.Console.WriteLine("Hello World! (A simple C# program.)"); System.Console.WriteLine("Hello World! (A simple C# program.)");
} }

+ 5
- 5
lib/misc/hello.f

@ -1,25 +1,25 @@
c Hello World in Fortran (by Clifford) c Hello World in Fortran (by Clifford)
c c
c --- ROCK-COPYRIGHT-NOTE-BEGIN --- c --- ROCK-COPYRIGHT-NOTE-BEGIN ---
c
c
c This copyright note is auto-generated by ./scripts/Create-CopyPatch. c This copyright note is auto-generated by ./scripts/Create-CopyPatch.
c Please add additional copyright information _after_ the line containing c Please add additional copyright information _after_ the line containing
c the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by c the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
c the ./scripts/Create-CopyPatch script. Do not edit this copyright text! c the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
c
c
c ROCK Linux: rock-src/misc/archive/hello.f c ROCK Linux: rock-src/misc/archive/hello.f
c Copyright (C) 1998 - 2003 Clifford Wolf c Copyright (C) 1998 - 2003 Clifford Wolf
c
c
c This program is free software; you can redistribute it and/or modify c This program is free software; you can redistribute it and/or modify
c it under the terms of the GNU General Public License as published by c it under the terms of the GNU General Public License as published by
c the Free Software Foundation; either version 2 of the License, or c the Free Software Foundation; either version 2 of the License, or
c (at your option) any later version. A copy of the GNU General Public c (at your option) any later version. A copy of the GNU General Public
c License can be found at Documentation/COPYING. c License can be found at Documentation/COPYING.
c
c
c Many people helped and are helping developing ROCK Linux. Please c Many people helped and are helping developing ROCK Linux. Please
c have a look at http://www.rocklinux.org/ and the Documentation/TEAM c have a look at http://www.rocklinux.org/ and the Documentation/TEAM
c file for details. c file for details.
c
c
c --- ROCK-COPYRIGHT-NOTE-END --- c --- ROCK-COPYRIGHT-NOTE-END ---
program hello_world program hello_world

+ 5
- 5
lib/misc/hello.java

@ -2,25 +2,25 @@
// Compile with 'gcj --main=hello hello.java' // Compile with 'gcj --main=hello hello.java'
// //
// --- ROCK-COPYRIGHT-NOTE-BEGIN --- // --- ROCK-COPYRIGHT-NOTE-BEGIN ---
//
//
// This copyright note is auto-generated by ./scripts/Create-CopyPatch. // This copyright note is auto-generated by ./scripts/Create-CopyPatch.
// Please add additional copyright information _after_ the line containing // Please add additional copyright information _after_ the line containing
// the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by // the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
// the ./scripts/Create-CopyPatch script. Do not edit this copyright text! // the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
//
//
// ROCK Linux: rock-src/misc/archive/hello.java // ROCK Linux: rock-src/misc/archive/hello.java
// Copyright (C) 1998 - 2003 Clifford Wolf // Copyright (C) 1998 - 2003 Clifford Wolf
//
//
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or // the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. A copy of the GNU General Public // (at your option) any later version. A copy of the GNU General Public
// License can be found at Documentation/COPYING. // License can be found at Documentation/COPYING.
//
//
// Many people helped and are helping developing ROCK Linux. Please // Many people helped and are helping developing ROCK Linux. Please
// have a look at http://www.rocklinux.org/ and the Documentation/TEAM // have a look at http://www.rocklinux.org/ and the Documentation/TEAM
// file for details. // file for details.
//
//
// --- ROCK-COPYRIGHT-NOTE-END --- // --- ROCK-COPYRIGHT-NOTE-END ---
public class hello { public class hello {

+ 3
- 3
lib/misc/hunter.sh

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/hunter.sh # Filename: lib/misc/hunter.sh
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 5
- 5
lib/misc/iso2stick.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/iso2stick.sh # Filename: lib/misc/iso2stick.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -25,7 +25,7 @@ usage()
fs="vfat -F 32" fs="vfat -F 32"
while [ "$1" ]; do while [ "$1" ]; do
case "$1" in
case "$1" in
-fs) fs="$2" ; shift ;; -fs) fs="$2" ; shift ;;
-*) usage ;; -*) usage ;;
*) break ;; *) break ;;
@ -43,7 +43,7 @@ dev="$1" ; shift
# # ceate fresh image # # ceate fresh image
# size=`du --block-size=1000000 $1 | cut -f 1` # size=`du --block-size=1000000 $1 | cut -f 1`
# size=$(( size + 20 )) # just to be sure # size=$(( size + 20 )) # just to be sure
#
#
# dd if=/dev/zero of=hd.img bs=1000000 count=$size # dd if=/dev/zero of=hd.img bs=1000000 count=$size
# loop=`losetup -f` # loop=`losetup -f`

+ 3
- 3
lib/misc/killport.sh

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/killport.sh # Filename: lib/misc/killport.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/killtree.sh

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/killtree.sh # Filename: lib/misc/killtree.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/mini-makedevs.sh

@ -5,14 +5,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/mini-makedevs.sh # Filename: lib/misc/mini-makedevs.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 5
- 5
lib/misc/mklibs.sh

@ -344,7 +344,7 @@ get-top-of-queue () {
# Note: If you want to add QENTRY to the *end* of QUEUE, you would do # Note: If you want to add QENTRY to the *end* of QUEUE, you would do
# something like the following: # something like the following:
# sed -e s/^$QUEUE_SEPERATOR$/$head"'\ # sed -e s/^$QUEUE_SEPERATOR$/$head"'\
# '"$QUEUE_SEPERATOR/"
# '"$QUEUE_SEPERATOR/"
# which is necessary to pass the newline to sed. I think we can take the # which is necessary to pass the newline to sed. I think we can take the
# easy way out. # easy way out.
@ -358,7 +358,7 @@ add-to-queue-if-not-there () {
if ! grep -q "^$qentry\$" "$qfile" ; then if ! grep -q "^$qentry\$" "$qfile" ; then
echo "$qentry" > "$fl_dir/add-to-queue-if-not-there" echo "$qentry" > "$fl_dir/add-to-queue-if-not-there"
cat "$qfile" >> "$fl_dir/add-to-queue-if-not-there" cat "$qfile" >> "$fl_dir/add-to-queue-if-not-there"
cat "$fl_dir/add-to-queue-if-not-there" > "$qfile"
cat "$fl_dir/add-to-queue-if-not-there" > "$qfile"
fi fi
done done
return 0 return 0
@ -557,7 +557,7 @@ get-extra-flags () {
exit 1 exit 1
fi fi
if [ "x$1" = "xlibc-2.0.7.so" ] ; then if [ "x$1" = "xlibc-2.0.7.so" ] ; then
echo `find-file $src_path ld-2.0.7.so` -lgcc
echo `find-file $src_path ld-2.0.7.so` -lgcc
return 0 return 0
fi fi
if [ "x$1" = "xlibc-2.1.2.so" ] ; then if [ "x$1" = "xlibc-2.1.2.so" ] ; then
@ -827,7 +827,7 @@ do
if [ -L "$lib" ] ; then if [ -L "$lib" ] ; then
$verbose -n 2>&1 L $verbose -n 2>&1 L
lib=`basename \`readlink $lib\`` lib=`basename \`readlink $lib\``
add-to-queue-if-not-there $fl_dir/library-depends "$lib"
add-to-queue-if-not-there $fl_dir/library-depends "$lib"
add-arrow $fl_dir/dependency-graph "$cur_lib" "$lib" add-arrow $fl_dir/dependency-graph "$cur_lib" "$lib"
else else
get-library-depends "$lib" > $fl_dir/backup get-library-depends "$lib" > $fl_dir/backup
@ -882,5 +882,5 @@ install-libs `cat $fl_dir/backup`
## Note that some of these symbols are weak and not having them is probably ## Note that some of these symbols are weak and not having them is probably
## not an error. ## not an error.
exit 0
exit 0

+ 3
- 3
lib/misc/regtest.sh

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/regtest.sh # Filename: lib/misc/regtest.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/reverse-log.pl

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/reverse-log.pl # Filename: lib/misc/reverse-log.pl
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 5
- 5
lib/misc/scrsav.c

@ -3,14 +3,14 @@
* *
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/scrsav.c * Filename: lib/misc/scrsav.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -67,12 +67,12 @@ int main(int argc, char ** argv) {
if ( c/LINESIZE+1 != time(NULL) % LINES ) if ( c/LINESIZE+1 != time(NULL) % LINES )
buffer[i] &= 0x0f; buffer[i] &= 0x0f;
} }
fd=open(argv[2], O_WRONLY); fd=open(argv[2], O_WRONLY);
if (fd < 0) { perror(argv[2]); return 1; } if (fd < 0) { perror(argv[2]); return 1; }
write(fd, miscdata, 4); write(fd, miscdata, 4);
write(fd, buffer, BUFSIZE); write(fd, buffer, BUFSIZE);
close(fd); close(fd);
return 0; return 0;
} }

+ 3
- 3
lib/misc/showdeps.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/showdeps.sh # Filename: lib/misc/showdeps.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/showsorteddeps.sh

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/showsorteddeps.sh # Filename: lib/misc/showsorteddeps.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/misc/split-patch.pl

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/split-patch.pl # Filename: lib/misc/split-patch.pl
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 9
- 9
lib/misc/tcp-client.c

@ -1,14 +1,14 @@
/* /*
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/tcp-client.c * Filename: lib/misc/tcp-client.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -36,15 +36,15 @@ int main(int argc, char ** argv) {
char buf[BUFSIZE]; char buf[BUFSIZE];
int sockfd,rc,c; int sockfd,rc,c;
fd_set rfds; fd_set rfds;
if (argc != 3) { if (argc != 3) {
printf("Usage: %s <IP-Address> <TCP-Port>\n",argv[0]); printf("Usage: %s <IP-Address> <TCP-Port>\n",argv[0]);
return 1; return 1;
} }
if ( (sockfd=socket(AF_INET,SOCK_STREAM,0)) < 0 ) if ( (sockfd=socket(AF_INET,SOCK_STREAM,0)) < 0 )
{ perror("socket"); return 1; } { perror("socket"); return 1; }
bzero(&servaddr,sizeof(servaddr)); bzero(&servaddr,sizeof(servaddr));
servaddr.sin_family = AF_INET; servaddr.sin_family = AF_INET;
servaddr.sin_port = htons(atoi(argv[2])); servaddr.sin_port = htons(atoi(argv[2]));
@ -52,11 +52,11 @@ int main(int argc, char ** argv) {
{ printf("Not an IP address: %s\n",argv[1]); return 1; } { printf("Not an IP address: %s\n",argv[1]); return 1; }
if ( connect(sockfd,&servaddr,sizeof(servaddr)) < 0 ) if ( connect(sockfd,&servaddr,sizeof(servaddr)) < 0 )
{ perror("connect"); return 1; } { perror("connect"); return 1; }
if (ioctl(0,TCGETA, &tbuf) == -1) { perror("ioctl1"); return 1; } if (ioctl(0,TCGETA, &tbuf) == -1) { perror("ioctl1"); return 1; }
tbufsav=tbuf; tbuf.c_lflag &= ~(ICANON|ECHO); tbufsav=tbuf; tbuf.c_lflag &= ~(ICANON|ECHO);
if (ioctl(0,TCSETAF, &tbuf) == -1) { perror("ioctl2"); return 1; } if (ioctl(0,TCSETAF, &tbuf) == -1) { perror("ioctl2"); return 1; }
do { do {
FD_ZERO(&rfds); FD_SET(sockfd,&rfds); FD_SET(0,&rfds); FD_ZERO(&rfds); FD_SET(sockfd,&rfds); FD_SET(0,&rfds);
tv.tv_sec=1; tv.tv_usec=0; tv.tv_sec=1; tv.tv_usec=0;
@ -72,7 +72,7 @@ int main(int argc, char ** argv) {
for (c=0; c<rc; c+=write(sockfd,buf,rc)) ; for (c=0; c<rc; c+=write(sockfd,buf,rc)) ;
} }
} while (rc > 0); } while (rc > 0);
if (ioctl(0,TCSETAF, &tbufsav) == -1) { perror("ioctl3"); return 1; } if (ioctl(0,TCSETAF, &tbufsav) == -1) { perror("ioctl3"); return 1; }
return 0; return 0;
} }

+ 3
- 3
lib/misc/treenice.sh

@ -2,14 +2,14 @@
# #
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/misc/treenice.sh # Filename: lib/misc/treenice.sh
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 15
- 15
lib/misc/xctrld.c

@ -3,14 +3,14 @@
* *
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/xctrld.c * Filename: lib/misc/xctrld.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -30,7 +30,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <errno.h>
#define PORT 2225 #define PORT 2225
@ -50,16 +50,16 @@ void do_session(int netfd) {
struct timeval tv; struct timeval tv;
char buf[BUFSIZE]; char buf[BUFSIZE];
fd_set rfds; fd_set rfds;
snprintf(buf,BUFSIZE,"\n" snprintf(buf,BUFSIZE,"\n"
"Hello! This is a mini telnet daemon which is not using a pty device.\n" "Hello! This is a mini telnet daemon which is not using a pty device.\n"
"So you wont have job control or other things where ptys are needed.\n" "So you wont have job control or other things where ptys are needed.\n"
"\nThis session has the PID %d. Have fun.\n\n",(int)getpid()); "\nThis session has the PID %d. Have fun.\n\n",(int)getpid());
write(netfd,buf,strlen(buf)); write(netfd,buf,strlen(buf));
pipe(p_in); pipe(p_out); pipe(p_in); pipe(p_out);
if (signal(SIGCHLD,SIG_DFL) == SIG_ERR) xprf("signal: %s",strerror(errno)); if (signal(SIGCHLD,SIG_DFL) == SIG_ERR) xprf("signal: %s",strerror(errno));
if ( (pid=fork()) == 0 ) { if ( (pid=fork()) == 0 ) {
close(0); dup2(p_in[0],0); close(0); dup2(p_in[0],0);
close(1); dup2(p_out[1],1); close(1); dup2(p_out[1],1);
@ -71,9 +71,9 @@ void do_session(int netfd) {
execl("/bin/sh","/bin/sh","--login","-i",NULL); execl("/bin/sh","/bin/sh","--login","-i",NULL);
xprf("execl: %s",strerror(errno)); exit(1); xprf("execl: %s",strerror(errno)); exit(1);
} }
close(p_in[0]); close(p_out[1]); close(p_in[0]); close(p_out[1]);
while (waitpid(pid,NULL,WNOHANG) != pid) { while (waitpid(pid,NULL,WNOHANG) != pid) {
FD_ZERO(&rfds); FD_SET(netfd,&rfds); FD_SET(p_out[0],&rfds); FD_ZERO(&rfds); FD_SET(netfd,&rfds); FD_SET(p_out[0],&rfds);
maxfd = netfd>p_out[0] ? netfd : p_out[0]; maxfd = netfd>p_out[0] ? netfd : p_out[0];
@ -95,12 +95,12 @@ void do_session(int netfd) {
int main(int argc, char ** argv) { int main(int argc, char ** argv) {
struct sockaddr_in addr; struct sockaddr_in addr;
int listenfd,fd; int listenfd,fd;
if (argc != 2 || argv[1][0] == '-') { if (argc != 2 || argv[1][0] == '-') {
fprintf(stderr,"Usage: %s < log-file | tty-device >\n",argv[0]); fprintf(stderr,"Usage: %s < log-file | tty-device >\n",argv[0]);
return 1; return 1;
} }
if ( (out=fopen(argv[1],"a+")) == NULL ) { if ( (out=fopen(argv[1],"a+")) == NULL ) {
fprintf(stderr,"Can't open log file '%s': %s",argv[1],strerror(errno)); fprintf(stderr,"Can't open log file '%s': %s",argv[1],strerror(errno));
return 1; return 1;
@ -115,18 +115,18 @@ int main(int argc, char ** argv) {
fprintf(out,"\n\n\r"); fprintf(out,"\n\n\r");
xprf("Binding port %d and waiting for connections ...\n",PORT); xprf("Binding port %d and waiting for connections ...\n",PORT);
if (signal(SIGCHLD,SIG_IGN) == SIG_ERR) xprf("signal: %s",strerror(errno)); if (signal(SIGCHLD,SIG_IGN) == SIG_ERR) xprf("signal: %s",strerror(errno));
if ((listenfd=socket(AF_INET,SOCK_STREAM,0)) == -1) xprf("socket: %s",strerror(errno)); if ((listenfd=socket(AF_INET,SOCK_STREAM,0)) == -1) xprf("socket: %s",strerror(errno));
bzero(&addr,sizeof(addr)); bzero(&addr,sizeof(addr));
addr.sin_family=AF_INET; addr.sin_family=AF_INET;
addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_addr.s_addr = htonl(INADDR_ANY);
addr.sin_port = htons(PORT); addr.sin_port = htons(PORT);
if (bind(listenfd,&addr,sizeof(addr)) == -1) xprf("bind: %s",strerror(errno)); if (bind(listenfd,&addr,sizeof(addr)) == -1) xprf("bind: %s",strerror(errno));
if (listen(listenfd,5)==-1) xprf("listen: %s",strerror(errno)); if (listen(listenfd,5)==-1) xprf("listen: %s",strerror(errno));
while (1) { while (1) {
if ((fd=accept(listenfd,NULL,NULL)) == -1) xprf("accept: %s",strerror(errno)); if ((fd=accept(listenfd,NULL,NULL)) == -1) xprf("accept: %s",strerror(errno));
if (!fork()) { if (!fork()) {

+ 5
- 5
lib/misc/xline.c

@ -1,14 +1,14 @@
/* /*
* --- SDE-COPYRIGHT-NOTE-BEGIN --- * --- SDE-COPYRIGHT-NOTE-BEGIN ---
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. * This copyright note is auto-generated by ./scripts/Create-CopyPatch.
*
*
* Filename: lib/misc/xline.c * Filename: lib/misc/xline.c
* Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2008 The OpenSDE Project
* Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project
* Copyright (C) 1998 - 2003 Clifford Wolf * Copyright (C) 1998 - 2003 Clifford Wolf
*
*
* More information can be found in the files COPYING and README. * More information can be found in the files COPYING and README.
*
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. A copy of the * the Free Software Foundation; version 2 of the License. A copy of the
@ -24,13 +24,13 @@ int main() {
char ch,line[512]; char ch,line[512];
time_t lasttm=0; time_t lasttm=0;
int c=0; int c=0;
while ( read(0,&ch,1)==1 ) { while ( read(0,&ch,1)==1 ) {
line[c++]=ch; line[c++]=ch;
if (ch == '\n') if (ch == '\n')
if (lasttm<time(NULL)-5) { if (lasttm<time(NULL)-5) {
line[c-1]=c=0; puts(line); time(&lasttm); line[c-1]=c=0; puts(line); time(&lasttm);
} else
} else
c=0; c=0;
else else
if (c>500) c=500; if (c>500) c=500;

+ 3
- 3
lib/output/config-100.in

@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# T2 SDE: misc/output/config-100.in # T2 SDE: misc/output/config-100.in
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/output/parse-config

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/output/parse-config # Filename: lib/output/parse-config
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/output/terminal

@ -1,12 +1,12 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: misc/output/terminal # Filename: misc/output/terminal
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 5
- 5
lib/parse-config

@ -1,14 +1,14 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/parse-config # Filename: lib/parse-config
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -30,7 +30,7 @@ arch_sizeof_short=undef ; arch_target=any-unknown-linux
if [ -f config/$config/config ] if [ -f config/$config/config ]
then then
# NOTE: ROCKCFG -> SDECFG automatized convertion # NOTE: ROCKCFG -> SDECFG automatized convertion
grep -q 'ROCKCFG' ./config/$config/config &&
grep -q 'ROCKCFG' ./config/$config/config &&
sed -i -e 's,ROCKCFG,SDECFG,g' ./config/$config/config sed -i -e 's,ROCKCFG,SDECFG,g' ./config/$config/config
. config/$config/config . config/$config/config
@ -101,7 +101,7 @@ export LC_ALL=C ; unset LANG ; umask 022
export BUILDCC="cc" BUILD_CC="cc" HOSTCC="cc" HOST_CC="cc" export BUILDCC="cc" BUILD_CC="cc" HOSTCC="cc" HOST_CC="cc"
export BUILDCXX="c++" BUILD_CXX="c++" HOSTCXX="c++" HOST_CXX="c++" export BUILDCXX="c++" BUILD_CXX="c++" HOSTCXX="c++" HOST_CXX="c++"
unset CPP ARFLAGS ASFLAGS CFLAGS CXXFLAGS CPPFLAGS FFLAGS LDFLAGS
unset CPP ARFLAGS ASFLAGS CFLAGS CXXFLAGS CPPFLAGS FFLAGS LDFLAGS
unset LD_LIBRARY_PATH LD_PRELOAD FLWRAPPER C_INCLUDE_PATH CONFIG_SITE unset LD_LIBRARY_PATH LD_PRELOAD FLWRAPPER C_INCLUDE_PATH CONFIG_SITE
unset DISPLAY unset DISPLAY

+ 3
- 3
lib/sde-binary/package-gem.sh

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-binary/package-gem.sh # Filename: lib/sde-binary/package-gem.sh
# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2007 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-binary/package.sh

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-binary/package.sh # Filename: lib/sde-binary/package.sh
# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2007 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-binary/preconfig.in

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-binary/preconfig.in # Filename: lib/sde-binary/preconfig.in
# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2007 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-build/config.cache

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-build/config.cache # Filename: lib/sde-build/config.cache
# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2005 The T2 SDE Project # Copyright (C) 2004 - 2005 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 4
- 4
lib/sde-cleanup/cleanup.sh

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-cleanup/cleanup.sh # Filename: lib/sde-cleanup/cleanup.sh
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -36,7 +36,7 @@ cleanup_basic() {
else else
type='file' type='file'
fi fi
if [ $delete -eq 1 ]; then if [ $delete -eq 1 ]; then
echo_info "Removing '$node' ($type)". echo_info "Removing '$node' ($type)".
case "$type" in case "$type" in

+ 3
- 3
lib/sde-commit/commit-message.awk

@ -1,12 +1,12 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-commit/commit-message.awk # Filename: lib/sde-commit/commit-message.awk
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-config/config-games.hlp

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/config-games.hlp # Filename: lib/sde-config/config-games.hlp
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-config/config-games.in

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/config-games.in # Filename: lib/sde-config/config-games.in
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-config/config-libs.hlp

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/config-libs.hlp # Filename: lib/sde-config/config-libs.hlp
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-config/config-libs.in

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/config-libs.in # Filename: lib/sde-config/config-libs.in
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 6
- 6
lib/sde-config/config.hlp

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/config.hlp # Filename: lib/sde-config/config.hlp
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -30,9 +30,9 @@ COMMENT_LICENSE
SDECFG_LICENSE_ISSUE SDECFG_LICENSE_ISSUE
The user of the T2-SDE is responsible for himself to verify The user of the T2-SDE is responsible for himself to verify
that packages that carry a limitation for re-distribution that packages that carry a limitation for re-distribution
are not redistributed in any form (e.g. ISOs).
are not redistributed in any form (e.g. ISOs).
The developers of the T2-SDE deny any responsibility for
The developers of the T2-SDE deny any responsibility for
mis-use of these packages. mis-use of these packages.
COMMENT_BUILD_SYS_CONF COMMENT_BUILD_SYS_CONF
@ -75,7 +75,7 @@ SDECFG_PARALLEL_MAX
also be defined when you use distcc to perform distributed builds. also be defined when you use distcc to perform distributed builds.
SDECFG_ABORT_ON_ERROR_AFTER SDECFG_ABORT_ON_ERROR_AFTER
The build will continue after a package build error only on an stage
The build will continue after a package build error only on an stage
greater than the value selected greater than the value selected
SDECFG_RETRY_BROKEN SDECFG_RETRY_BROKEN

+ 5
- 5
lib/sde-config/functions.in

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/functions.in # Filename: lib/sde-config/functions.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -554,7 +554,7 @@ Subscribe to the mailing list by sending an empty e-mail to:
and confirm the subscription request by replying to the mail and confirm the subscription request by replying to the mail
our mailing list manager will send you." our mailing list manager will send you."
# Ok let us find a help for the current item ... # Ok let us find a help for the current item ...
# First of all mask all special chars in the item name # First of all mask all special chars in the item name
@ -570,7 +570,7 @@ $item_name:\\
s/^ // s/^ //
p p
}" lib/*/config*.hlp package/*/*/subconfig-*.hlp package/*/*/config*.hlp target/*/config*.hlp 2>/dev/null ) }" lib/*/config*.hlp package/*/*/subconfig-*.hlp package/*/*/config*.hlp target/*/config*.hlp 2>/dev/null )
# Get help strings out of the temporary file. # Get help strings out of the temporary file.
tmp_text=$(grep "^$item_name" $cfgtmpdir/config.help | cut -f2- -d' ' | sed -e "s,^',," -e "s,'$,," ) tmp_text=$(grep "^$item_name" $cfgtmpdir/config.help | cut -f2- -d' ' | sed -e "s,^',," -e "s,'$,," )

+ 5
- 5
lib/sde-config/main.in

@ -1,13 +1,13 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/main.in # Filename: lib/sde-config/main.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -181,7 +181,7 @@ if test -f $cfgtmpdir/license-issue.ask; then
comment ' ' comment ' '
fi fi
bool 'I have read and understood the licensing issues.' SDECFG_LICENSE_ISSUE 0 bool 'I have read and understood the licensing issues.' SDECFG_LICENSE_ISSUE 0
block_end block_end
@ -416,7 +416,7 @@ pkgfilter sed '/^[XO] --* / d;'
SDECFG_ID="`echo $SDECFG_ID | sed 's,-noexpert.*,,'`" SDECFG_ID="`echo $SDECFG_ID | sed 's,-noexpert.*,,'`"
[ "$SDECFG_IDCKSUM" = 1 ] && [ "$SDECFG_IDCKSUM" = 1 ] &&
SDECFG_ID="`echo $SDECFG_ID | cksum | cut -f1 -d' '`"
SDECFG_ID="`echo $SDECFG_ID | cksum | cut -f1 -d' '`"
const SDECFG_SHORTID "$SDECFG_ID" const SDECFG_SHORTID "$SDECFG_ID"
SDECFG_ID="$config-$SDECFG_ID" SDECFG_ID="$config-$SDECFG_ID"

+ 6
- 6
lib/sde-config/pkgsel2awk.sh

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-config/pkgsel2awk.sh # Filename: lib/sde-config/pkgsel2awk.sh
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
@ -21,7 +21,7 @@
# Example: # Example:
# pkgsel X python # pkgsel X python
# Result: ( / [^/]*\/python / ) { $1="X"; } # Result: ( / [^/]*\/python / ) { $1="X"; }
# pkgsel "O perl/*"
# pkgsel "O perl/*"
# Result: ( / perl\/[^/]* / ) { $1="O"; } # Result: ( / perl\/[^/]* / ) { $1="O"; }
# pkgsel_parse < config/${config}/pkgsel # pkgsel_parse < config/${config}/pkgsel
# Result: creates pkgsel.awk output # Result: creates pkgsel.awk output
@ -80,7 +80,7 @@ pkgsel_parse() {
} }
cat <<EOF cat <<EOF
{
{
def=\$1 ; def=\$1 ;
repo=\$4 ; repo=\$4 ;
pkg=\$5 ; pkg=\$5 ;
@ -92,7 +92,7 @@ EOF
pkgsel_parse "$@" pkgsel_parse "$@"
cat <<EOF cat <<EOF
{
{
\$4=repo ; \$4=repo ;
\$5=pkg ; \$5=pkg ;
print ; print ;

+ 3
- 3
lib/sde-download/cksum.sh

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-download/cksum.sh # Filename: lib/sde-download/cksum.sh
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2007 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-download/mirror-test.sh

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-download/mirror-test.sh # Filename: lib/sde-download/mirror-test.sh
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-download/validate.sh

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-download/validate.sh # Filename: lib/sde-download/validate.sh
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 3
- 3
lib/sde-package.in

@ -1,11 +1,11 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
#
# Filename: lib/sde-package.in # Filename: lib/sde-package.in
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
#
#
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
#
#
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the

+ 71
- 71
lib/sde-package/BeautifulSoup.py

@ -11,7 +11,7 @@ A well-formed XML/HTML document yields a well-formed data
structure. An ill-formed XML/HTML document yields a correspondingly structure. An ill-formed XML/HTML document yields a correspondingly
ill-formed data structure. If your document is only locally ill-formed data structure. If your document is only locally
well-formed, you can use this library to find and process the well-formed, you can use this library to find and process the
well-formed part of it. The BeautifulSoup class
well-formed part of it. The BeautifulSoup class
Beautiful Soup works with Python 2.2 and up. It has no external Beautiful Soup works with Python 2.2 and up. It has no external
dependencies, but you'll have more success at converting data to UTF-8 dependencies, but you'll have more success at converting data to UTF-8
@ -24,7 +24,7 @@ if you also install these three packages:
http://cjkpython.i18n.org/ http://cjkpython.i18n.org/
Beautiful Soup defines classes for two main parsing strategies: Beautiful Soup defines classes for two main parsing strategies:
* BeautifulStoneSoup, for parsing XML, SGML, or your domain-specific * BeautifulStoneSoup, for parsing XML, SGML, or your domain-specific
language that kind of looks like XML. language that kind of looks like XML.
@ -71,7 +71,7 @@ class PageElement:
def setup(self, parent=None, previous=None): def setup(self, parent=None, previous=None):
"""Sets up the initial relations between this element and """Sets up the initial relations between this element and
other elements."""
other elements."""
self.parent = parent self.parent = parent
self.previous = previous self.previous = previous
self.next = None self.next = None
@ -81,7 +81,7 @@ class PageElement:
self.previousSibling = self.parent.contents[-1] self.previousSibling = self.parent.contents[-1]
self.previousSibling.nextSibling = self self.previousSibling.nextSibling = self
def replaceWith(self, replaceWith):
def replaceWith(self, replaceWith):
oldParent = self.parent oldParent = self.parent
myIndex = self.parent.contents.index(self) myIndex = self.parent.contents.index(self)
if hasattr(replaceWith, 'parent') and replaceWith.parent == self.parent: if hasattr(replaceWith, 'parent') and replaceWith.parent == self.parent:
@ -92,11 +92,11 @@ class PageElement:
# means that when we extract it, the index of this # means that when we extract it, the index of this
# element will change. # element will change.
myIndex = myIndex - 1 myIndex = myIndex - 1
self.extract()
self.extract()
oldParent.insert(myIndex, replaceWith) oldParent.insert(myIndex, replaceWith)
def extract(self): def extract(self):
"""Destructively rips this element out of the tree."""
"""Destructively rips this element out of the tree."""
if self.parent: if self.parent:
try: try:
self.parent.contents.remove(self) self.parent.contents.remove(self)
@ -105,7 +105,7 @@ class PageElement:
#Find the two elements that would be next to each other if #Find the two elements that would be next to each other if
#this element (and any children) hadn't been parsed. Connect #this element (and any children) hadn't been parsed. Connect
#the two.
#the two.
lastChild = self._lastRecursiveChild() lastChild = self._lastRecursiveChild()
nextElement = lastChild.next nextElement = lastChild.next
@ -116,12 +116,12 @@ class PageElement:
self.previous = None self.previous = None
lastChild.next = None lastChild.next = None
self.parent = None
self.parent = None
if self.previousSibling: if self.previousSibling:
self.previousSibling.nextSibling = self.nextSibling self.previousSibling.nextSibling = self.nextSibling
if self.nextSibling: if self.nextSibling:
self.nextSibling.previousSibling = self.previousSibling self.nextSibling.previousSibling = self.previousSibling
self.previousSibling = self.nextSibling = None
self.previousSibling = self.nextSibling = None
def _lastRecursiveChild(self): def _lastRecursiveChild(self):
"Finds the last element beneath this object to be parsed." "Finds the last element beneath this object to be parsed."
@ -134,12 +134,12 @@ class PageElement:
if (isinstance(newChild, basestring) if (isinstance(newChild, basestring)
or isinstance(newChild, unicode)) \ or isinstance(newChild, unicode)) \
and not isinstance(newChild, NavigableString): and not isinstance(newChild, NavigableString):
newChild = NavigableString(newChild)
newChild = NavigableString(newChild)
position = min(position, len(self.contents)) position = min(position, len(self.contents))
if hasattr(newChild, 'parent') and newChild.parent != None: if hasattr(newChild, 'parent') and newChild.parent != None:
# We're 'inserting' an element that's already one # We're 'inserting' an element that's already one
# of this object's children.
# of this object's children.
if newChild.parent == self: if newChild.parent == self:
index = self.find(newChild) index = self.find(newChild)
if index and index < position: if index and index < position:
@ -149,7 +149,7 @@ class PageElement:
# will jump down one. # will jump down one.
position = position - 1 position = position - 1
newChild.extract() newChild.extract()
newChild.parent = self newChild.parent = self
previousChild = None previousChild = None
if position == 0: if position == 0:
@ -161,13 +161,13 @@ class PageElement:
newChild.previousSibling.nextSibling = newChild newChild.previousSibling.nextSibling = newChild
newChild.previous = previousChild._lastRecursiveChild() newChild.previous = previousChild._lastRecursiveChild()
if newChild.previous: if newChild.previous:
newChild.previous.next = newChild
newChild.previous.next = newChild
newChildsLastElement = newChild._lastRecursiveChild() newChildsLastElement = newChild._lastRecursiveChild()
if position >= len(self.contents): if position >= len(self.contents):
newChild.nextSibling = None newChild.nextSibling = None
parent = self parent = self
parentsNextSibling = None parentsNextSibling = None
while not parentsNextSibling: while not parentsNextSibling:
@ -180,8 +180,8 @@ class PageElement:
else: else:
newChildsLastElement.next = None newChildsLastElement.next = None
else: else:
nextChild = self.contents[position]
newChild.nextSibling = nextChild
nextChild = self.contents[position]
newChild.nextSibling = nextChild
if newChild.nextSibling: if newChild.nextSibling:
newChild.nextSibling.previousSibling = newChild newChild.nextSibling.previousSibling = newChild
newChildsLastElement.next = nextChild newChildsLastElement.next = nextChild
@ -269,7 +269,7 @@ class PageElement:
if l: if l:
r = l[0] r = l[0]
return r return r
def _findAll(self, name, attrs, text, limit, generator, **kwargs): def _findAll(self, name, attrs, text, limit, generator, **kwargs):
"Iterates over a generator looking for things that match." "Iterates over a generator looking for things that match."
@ -294,7 +294,7 @@ class PageElement:
return results return results
#These Generators can be used to navigate starting from both #These Generators can be used to navigate starting from both
#NavigableStrings and Tags.
#NavigableStrings and Tags.
def nextGenerator(self): def nextGenerator(self):
i = self i = self
while i: while i:
@ -328,7 +328,7 @@ class PageElement:
# Utility methods # Utility methods
def substituteEncoding(self, str, encoding=None): def substituteEncoding(self, str, encoding=None):
encoding = encoding or "utf-8" encoding = encoding or "utf-8"
return str.replace("%SOUP-ENCODING%", encoding)
return str.replace("%SOUP-ENCODING%", encoding)
def toEncoding(self, s, encoding=None): def toEncoding(self, s, encoding=None):
"""Encodes an object to a string in some encoding, or to Unicode. """Encodes an object to a string in some encoding, or to Unicode.
@ -367,7 +367,7 @@ class NavigableString(unicode, PageElement):
return self.encode(encoding) return self.encode(encoding)
else: else:
return self return self
class CData(NavigableString): class CData(NavigableString):
def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
@ -382,11 +382,11 @@ class ProcessingInstruction(NavigableString):
class Comment(NavigableString): class Comment(NavigableString):
def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
return "<!--%s-->" % NavigableString.__str__(self, encoding)
return "<!--%s-->" % NavigableString.__str__(self, encoding)
class Declaration(NavigableString): class Declaration(NavigableString):
def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING):
return "<!%s>" % NavigableString.__str__(self, encoding)
return "<!%s>" % NavigableString.__str__(self, encoding)
class Tag(PageElement): class Tag(PageElement):
@ -419,7 +419,7 @@ class Tag(PageElement):
"""Returns the value of the 'key' attribute for the tag, or """Returns the value of the 'key' attribute for the tag, or
the value given for 'default' if it doesn't have that the value given for 'default' if it doesn't have that
attribute.""" attribute."""
return self._getAttrMap().get(key, default)
return self._getAttrMap().get(key, default)
def has_key(self, key): def has_key(self, key):
return self._getAttrMap().has_key(key) return self._getAttrMap().has_key(key)
@ -444,7 +444,7 @@ class Tag(PageElement):
"A tag is non-None even if it has no contents." "A tag is non-None even if it has no contents."
return True return True
def __setitem__(self, key, value):
def __setitem__(self, key, value):
"""Setting tag[key] sets the value of the 'key' attribute for the """Setting tag[key] sets the value of the 'key' attribute for the
tag.""" tag."""
self._getAttrMap() self._getAttrMap()
@ -522,7 +522,7 @@ class Tag(PageElement):
if self.attrs: if self.attrs:
for key, val in self.attrs: for key, val in self.attrs:
fmt = '%s="%s"' fmt = '%s="%s"'
if isString(val):
if isString(val):
if self.containsSubstitutions and '%SOUP-ENCODING%' in val: if self.containsSubstitutions and '%SOUP-ENCODING%' in val:
val = self.substituteEncoding(val, encoding) val = self.substituteEncoding(val, encoding)
@ -555,7 +555,7 @@ class Tag(PageElement):
val = re.sub("([<>]|&(?![^\s]+;))", val = re.sub("([<>]|&(?![^\s]+;))",
lambda x: "&" + self.XML_SPECIAL_CHARS_TO_ENTITIES[x.group(0)[0]] + ";", lambda x: "&" + self.XML_SPECIAL_CHARS_TO_ENTITIES[x.group(0)[0]] + ";",
val) val)
attrs.append(fmt % (self.toEncoding(key, encoding), attrs.append(fmt % (self.toEncoding(key, encoding),
self.toEncoding(val, encoding))) self.toEncoding(val, encoding)))
close = '' close = ''
@ -577,7 +577,7 @@ class Tag(PageElement):
s = [] s = []
attributeString = '' attributeString = ''
if attrs: if attrs:
attributeString = ' ' + ' '.join(attrs)
attributeString = ' ' + ' '.join(attrs)
if prettyPrint: if prettyPrint:
s.append(space) s.append(space)
s.append('<%s%s%s>' % (encodedName, attributeString, close)) s.append('<%s%s%s>' % (encodedName, attributeString, close))
@ -609,14 +609,14 @@ class Tag(PageElement):
elif isinstance(c, Tag): elif isinstance(c, Tag):
s.append(c.__str__(encoding, prettyPrint, indentLevel)) s.append(c.__str__(encoding, prettyPrint, indentLevel))
if text and prettyPrint: if text and prettyPrint:
text = text.strip()
text = text.strip()
if text: if text:
if prettyPrint: if prettyPrint:
s.append(" " * (indentLevel-1)) s.append(" " * (indentLevel-1))
s.append(text) s.append(text)
if prettyPrint: if prettyPrint:
s.append("\n") s.append("\n")
return ''.join(s)
return ''.join(s)
#Soup methods #Soup methods
@ -651,13 +651,13 @@ class Tag(PageElement):
# Pre-3.x compatibility methods # Pre-3.x compatibility methods
first = find first = find
fetch = findAll fetch = findAll
def fetchText(self, text=None, recursive=True, limit=None): def fetchText(self, text=None, recursive=True, limit=None):
return self.findAll(text=text, recursive=recursive, limit=limit) return self.findAll(text=text, recursive=recursive, limit=limit)
def firstText(self, text=None, recursive=True): def firstText(self, text=None, recursive=True):
return self.find(text=text, recursive=recursive) return self.find(text=text, recursive=recursive)
#Utility methods #Utility methods
def append(self, tag): def append(self, tag):
@ -672,7 +672,7 @@ class Tag(PageElement):
if not getattr(self, 'attrMap'): if not getattr(self, 'attrMap'):
self.attrMap = {} self.attrMap = {}
for (key, value) in self.attrs: for (key, value) in self.attrs:
self.attrMap[key] = value
self.attrMap[key] = value
return self.attrMap return self.attrMap
#Generator methods #Generator methods
@ -680,12 +680,12 @@ class Tag(PageElement):
for i in range(0, len(self.contents)): for i in range(0, len(self.contents)):
yield self.contents[i] yield self.contents[i]
raise StopIteration raise StopIteration
def recursiveChildGenerator(self): def recursiveChildGenerator(self):
stack = [(self, 0)] stack = [(self, 0)]
while stack: while stack:
tag, start = stack.pop() tag, start = stack.pop()
if isinstance(tag, Tag):
if isinstance(tag, Tag):
for i in range(start, len(tag.contents)): for i in range(start, len(tag.contents)):
a = tag.contents[i] a = tag.contents[i]
yield a yield a
@ -720,7 +720,7 @@ class SoupStrainer:
return self.text return self.text
else: else:
return "%s|%s" % (self.name, self.attrs) return "%s|%s" % (self.name, self.attrs)
def searchTag(self, markupName=None, markupAttrs={}): def searchTag(self, markupName=None, markupAttrs={}):
found = None found = None
markup = None markup = None
@ -737,7 +737,7 @@ class SoupStrainer:
if callFunctionWithTagData: if callFunctionWithTagData:
match = self.name(markupName, markupAttrs) match = self.name(markupName, markupAttrs)
else: else:
match = True
match = True
markupAttrMap = None markupAttrMap = None
for attr, matchAgainst in self.attrs.items(): for attr, matchAgainst in self.attrs.items():
if not markupAttrMap: if not markupAttrMap:
@ -762,7 +762,7 @@ class SoupStrainer:
#print 'looking for %s in %s' % (self, markup) #print 'looking for %s in %s' % (self, markup)
found = None found = None
# If given a list of items, scan it for a text element that # If given a list of items, scan it for a text element that
# matches.
# matches.
if isList(markup) and not isinstance(markup, Tag): if isList(markup) and not isinstance(markup, Tag):
for element in markup: for element in markup:
if isinstance(element, NavigableString) \ if isinstance(element, NavigableString) \
@ -783,8 +783,8 @@ class SoupStrainer:
raise Exception, "I don't know how to match against a %s" \ raise Exception, "I don't know how to match against a %s" \
% markup.__class__ % markup.__class__
return found return found
def _matches(self, markup, matchAgainst):
def _matches(self, markup, matchAgainst):
#print "Matching %s against %s" % (markup, matchAgainst) #print "Matching %s against %s" % (markup, matchAgainst)
result = False result = False
if matchAgainst == True and type(matchAgainst) == types.BooleanType: if matchAgainst == True and type(matchAgainst) == types.BooleanType:
@ -835,7 +835,7 @@ def isString(s):
"""Convenience method that works with all 2.x versions of Python """Convenience method that works with all 2.x versions of Python
to determine whether or not something is stringlike.""" to determine whether or not something is stringlike."""
try: try:
return isinstance(s, unicode) or isintance(s, basestring)
return isinstance(s, unicode) or isintance(s, basestring)
except NameError: except NameError:
return isinstance(s, str) return isinstance(s, str)
@ -865,7 +865,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
"""This class contains the basic parser and search code. It defines """This class contains the basic parser and search code. It defines
a parser that knows nothing about tag behavior except for the a parser that knows nothing about tag behavior except for the
following: following:
You can't close a tag without closing all the tags it encloses. You can't close a tag without closing all the tags it encloses.
That is, "<foo><bar></foo>" actually means That is, "<foo><bar></foo>" actually means
"<foo><bar></bar></foo>". "<foo><bar></bar></foo>".
@ -880,7 +880,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
XML_ENTITY_LIST = {} XML_ENTITY_LIST = {}
for i in Tag.XML_SPECIAL_CHARS_TO_ENTITIES.values(): for i in Tag.XML_SPECIAL_CHARS_TO_ENTITIES.values():
XML_ENTITY_LIST[i] = True
XML_ENTITY_LIST[i] = True
SELF_CLOSING_TAGS = {} SELF_CLOSING_TAGS = {}
NESTABLE_TAGS = {} NESTABLE_TAGS = {}
@ -903,7 +903,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
convertEntities=None, selfClosingTags=None): convertEntities=None, selfClosingTags=None):
"""The Soup object is initialized as the 'root tag', and the """The Soup object is initialized as the 'root tag', and the
provided markup (which can be a string or a file-like object) provided markup (which can be a string or a file-like object)
is fed into the underlying parser.
is fed into the underlying parser.
sgmllib will process most bad HTML, and the BeautifulSoup sgmllib will process most bad HTML, and the BeautifulSoup
class has some tricks for dealing with some HTML that kills class has some tricks for dealing with some HTML that kills
@ -937,7 +937,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
self.smartQuotesTo = None self.smartQuotesTo = None
self.instanceSelfClosingTags = buildTagMap(None, selfClosingTags) self.instanceSelfClosingTags = buildTagMap(None, selfClosingTags)
SGMLParser.__init__(self) SGMLParser.__init__(self)
if hasattr(markup, 'read'): # It's a file-type object. if hasattr(markup, 'read'): # It's a file-type object.
markup = markup.read() markup = markup.read()
self.markup = markup self.markup = markup
@ -947,7 +947,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
except StopParsing: except StopParsing:
pass pass
self.markup = None # The markup can now be GCed self.markup = None # The markup can now be GCed
def _feed(self, inDocumentEncoding=None): def _feed(self, inDocumentEncoding=None):
# Convert the document to Unicode. # Convert the document to Unicode.
markup = self.markup markup = self.markup
@ -963,7 +963,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
if markup: if markup:
if self.markupMassage: if self.markupMassage:
if not isList(self.markupMassage): if not isList(self.markupMassage):
self.markupMassage = self.MARKUP_MASSAGE
self.markupMassage = self.MARKUP_MASSAGE
for fix, m in self.markupMassage: for fix, m in self.markupMassage:
markup = fix.sub(m, markup) markup = fix.sub(m, markup)
self.reset() self.reset()
@ -992,7 +992,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
self-closing tag according to this parser.""" self-closing tag according to this parser."""
return self.SELF_CLOSING_TAGS.has_key(name) \ return self.SELF_CLOSING_TAGS.has_key(name) \
or self.instanceSelfClosingTags.has_key(name) or self.instanceSelfClosingTags.has_key(name)
def reset(self): def reset(self):
Tag.__init__(self, self, self.ROOT_TAG_NAME) Tag.__init__(self, self, self.ROOT_TAG_NAME)
self.hidden = 1 self.hidden = 1
@ -1002,7 +1002,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
self.tagStack = [] self.tagStack = []
self.quoteStack = [] self.quoteStack = []
self.pushTag(self) self.pushTag(self)
def popTag(self): def popTag(self):
tag = self.tagStack.pop() tag = self.tagStack.pop()
# Tags with just one string-owning child get the child as a # Tags with just one string-owning child get the child as a
@ -1052,7 +1052,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
the given tag.""" the given tag."""
#print "Popping to %s" % name #print "Popping to %s" % name
if name == self.ROOT_TAG_NAME: if name == self.ROOT_TAG_NAME:
return
return
numPops = 0 numPops = 0
mostRecentTag = None mostRecentTag = None
@ -1065,7 +1065,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
for i in range(0, numPops): for i in range(0, numPops):
mostRecentTag = self.popTag() mostRecentTag = self.popTag()
return mostRecentTag
return mostRecentTag
def _smartPop(self, name): def _smartPop(self, name):
@ -1102,7 +1102,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
and p.name in nestingResetTriggers) \ and p.name in nestingResetTriggers) \
or (nestingResetTriggers == None and isResetNesting or (nestingResetTriggers == None and isResetNesting
and self.RESET_NESTING_TAGS.has_key(p.name)): and self.RESET_NESTING_TAGS.has_key(p.name)):
#If we encounter one of the nesting reset triggers #If we encounter one of the nesting reset triggers
#peculiar to this tag, or we encounter another tag #peculiar to this tag, or we encounter another tag
#that causes nesting to reset, pop up to but not #that causes nesting to reset, pop up to but not
@ -1121,7 +1121,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
#print "<%s> is not real!" % name #print "<%s> is not real!" % name
attrs = ''.join(map(lambda(x, y): ' %s="%s"' % (x, y), attrs)) attrs = ''.join(map(lambda(x, y): ' %s="%s"' % (x, y), attrs))
self.handle_data('<%s%s>' % (name, attrs)) self.handle_data('<%s%s>' % (name, attrs))
return
return
self.endData() self.endData()
if not self.isSelfClosingTag(name) and not selfClosing: if not self.isSelfClosingTag(name) and not selfClosing:
@ -1137,7 +1137,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
self.previous = tag self.previous = tag
self.pushTag(tag) self.pushTag(tag)
if selfClosing or self.isSelfClosingTag(name): if selfClosing or self.isSelfClosingTag(name):
self.popTag()
self.popTag()
if name in self.QUOTE_TAGS: if name in self.QUOTE_TAGS:
#print "Beginning quote (%s)" % name #print "Beginning quote (%s)" % name
self.quoteStack.append(name) self.quoteStack.append(name)
@ -1203,7 +1203,7 @@ class BeautifulStoneSoup(Tag, SGMLParser):
if not data: if not data:
data = '&%s;' % ref data = '&%s;' % ref
self.handle_data(data) self.handle_data(data)
def handle_decl(self, data): def handle_decl(self, data):
"Handle DOCTYPEs and the like as Declaration objects." "Handle DOCTYPEs and the like as Declaration objects."
self._toStringSubclass(data, Declaration) self._toStringSubclass(data, Declaration)
@ -1286,7 +1286,7 @@ class BeautifulSoup(BeautifulStoneSoup):
'spacer', 'link', 'frame', 'base']) 'spacer', 'link', 'frame', 'base'])
QUOTE_TAGS = {'script': None} QUOTE_TAGS = {'script': None}
#According to the HTML standard, each of these inline tags can #According to the HTML standard, each of these inline tags can
#contain another tag of the same type. Furthermore, it's common #contain another tag of the same type. Furthermore, it's common
#to actually use these tags this way. #to actually use these tags this way.
@ -1298,7 +1298,7 @@ class BeautifulSoup(BeautifulStoneSoup):
#to actually use these tags this way. #to actually use these tags this way.
NESTABLE_BLOCK_TAGS = ['blockquote', 'div', 'fieldset', 'ins', 'del'] NESTABLE_BLOCK_TAGS = ['blockquote', 'div', 'fieldset', 'ins', 'del']
#Lists can contain other lists, but there are restrictions.
#Lists can contain other lists, but there are restrictions.
NESTABLE_LIST_TAGS = { 'ol' : [], NESTABLE_LIST_TAGS = { 'ol' : [],
'ul' : [], 'ul' : [],
'li' : ['ul', 'ol'], 'li' : ['ul', 'ol'],
@ -1306,8 +1306,8 @@ class BeautifulSoup(BeautifulStoneSoup):
'dd' : ['dl'], 'dd' : ['dl'],
'dt' : ['dl'] } 'dt' : ['dl'] }
#Tables can contain other tables, but there are restrictions.
NESTABLE_TABLE_TAGS = {'table' : [],
#Tables can contain other tables, but there are restrictions.
NESTABLE_TABLE_TAGS = {'table' : [],
'tr' : ['table', 'tbody', 'tfoot', 'thead'], 'tr' : ['table', 'tbody', 'tfoot', 'thead'],
'td' : ['tr'], 'td' : ['tr'],
'th' : ['tr'], 'th' : ['tr'],
@ -1377,7 +1377,7 @@ class BeautifulSoup(BeautifulStoneSoup):
class StopParsing(Exception): class StopParsing(Exception):
pass pass
class ICantBelieveItsBeautifulSoup(BeautifulSoup): class ICantBelieveItsBeautifulSoup(BeautifulSoup):
"""The BeautifulSoup class is oriented towards skipping over """The BeautifulSoup class is oriented towards skipping over
@ -1423,7 +1423,7 @@ class MinimalSoup(BeautifulSoup):
This also makes it better for subclassing than BeautifulStoneSoup This also makes it better for subclassing than BeautifulStoneSoup
or BeautifulSoup.""" or BeautifulSoup."""
RESET_NESTING_TAGS = buildTagMap('noscript') RESET_NESTING_TAGS = buildTagMap('noscript')
NESTABLE_TAGS = {} NESTABLE_TAGS = {}
@ -1453,7 +1453,7 @@ class BeautifulSOAP(BeautifulStoneSoup):
parent = self.tagStack[-2] parent = self.tagStack[-2]
parent._getAttrMap() parent._getAttrMap()
if (isinstance(tag, Tag) and len(tag.contents) == 1 and if (isinstance(tag, Tag) and len(tag.contents) == 1 and
isinstance(tag.contents[0], NavigableString) and
isinstance(tag.contents[0], NavigableString) and
not parent.attrMap.has_key(tag.name)): not parent.attrMap.has_key(tag.name)):
parent[tag.name] = tag.contents[0] parent[tag.name] = tag.contents[0]
BeautifulStoneSoup.popTag(self) BeautifulStoneSoup.popTag(self)
@ -1530,9 +1530,9 @@ class UnicodeDammit:
self.triedEncodings = [] self.triedEncodings = []
if markup == '' or isinstance(markup, unicode): if markup == '' or isinstance(markup, unicode):
self.originalEncoding = None self.originalEncoding = None
self.unicode = unicode(markup)
self.unicode = unicode(markup)
return return
u = None u = None
for proposedEncoding in overrideEncodings: for proposedEncoding in overrideEncodings:
u = self._convertFrom(proposedEncoding) u = self._convertFrom(proposedEncoding)
@ -1541,7 +1541,7 @@ class UnicodeDammit:
for proposedEncoding in (documentEncoding, sniffedEncoding): for proposedEncoding in (documentEncoding, sniffedEncoding):
u = self._convertFrom(proposedEncoding) u = self._convertFrom(proposedEncoding)
if u: break if u: break
# If no luck and we have auto-detection library, try that: # If no luck and we have auto-detection library, try that:
if not u and chardet and not isinstance(self.markup, unicode): if not u and chardet and not isinstance(self.markup, unicode):
u = self._convertFrom(chardet.detect(self.markup)['encoding']) u = self._convertFrom(chardet.detect(self.markup)['encoding'])
@ -1563,9 +1563,9 @@ class UnicodeDammit:
sub = '&#x%s;' % sub[1] sub = '&#x%s;' % sub[1]
else: else:
sub = '&%s;' % sub[0] sub = '&%s;' % sub[0]
return sub
return sub
def _convertFrom(self, proposed):
def _convertFrom(self, proposed):
proposed = self.find_codec(proposed) proposed = self.find_codec(proposed)
if not proposed or proposed in self.triedEncodings: if not proposed or proposed in self.triedEncodings:
return None return None
@ -1584,12 +1584,12 @@ class UnicodeDammit:
try: try:
# print "Trying to convert document to %s" % proposed # print "Trying to convert document to %s" % proposed
u = self._toUnicode(markup, proposed) u = self._toUnicode(markup, proposed)
self.markup = u
self.markup = u
self.originalEncoding = proposed self.originalEncoding = proposed
except Exception, e: except Exception, e:
# print "That didn't work!" # print "That didn't work!"
# print e # print e
return None
return None
#print "Correct encoding: %s" % proposed #print "Correct encoding: %s" % proposed
return self.markup return self.markup
@ -1617,7 +1617,7 @@ class UnicodeDammit:
data = data[4:] data = data[4:]
newdata = unicode(data, encoding) newdata = unicode(data, encoding)
return newdata return newdata
def _detectEncoding(self, xml_data): def _detectEncoding(self, xml_data):
"""Given a document, tries to detect its XML encoding.""" """Given a document, tries to detect its XML encoding."""
xml_encoding = sniffed_xml_encoding = None xml_encoding = sniffed_xml_encoding = None
@ -1689,7 +1689,7 @@ class UnicodeDammit:
or charset or charset
def _codec(self, charset): def _codec(self, charset):
if not charset: return charset
if not charset: return charset
codec = None codec = None
try: try:
codecs.lookup(charset) codecs.lookup(charset)

+ 6
- 6
lib/sde-package/info.py

@ -1,7 +1,7 @@
import time import time
base="http://packages.debian.org" base="http://packages.debian.org"
distro="stable" distro="stable"
usage ="""sde pkg new --deb [options] arg
usage ="""sde pkg new --deb [options] arg
example: sde pkg new -deb -o network/apache2 apache2 example: sde pkg new -deb -o network/apache2 apache2
Run --help (-h) for more info""" Run --help (-h) for more info"""
force=True force=True
@ -9,18 +9,18 @@ guess=True
def copynote(package): def copynote(package):
return """[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- return """[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY]
[COPY] Filename: package/.../%(p)s/%(p)s.desc [COPY] Filename: package/.../%(p)s/%(p)s.desc
[COPY] Copyright (C) %(t)s The OpenSDE Project [COPY] Copyright (C) %(t)s The OpenSDE Project
[COPY]
[COPY]
[COPY] More information can be found in the files COPYING and README. [COPY] More information can be found in the files COPYING and README.
[COPY]
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify [COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by [COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; version 2 of the License. A copy of the [COPY] the Free Software Foundation; version 2 of the License. A copy of the
[COPY] GNU General Public License can be found in the file COPYING. [COPY] GNU General Public License can be found in the file COPYING.
[COPY] --- SDE-COPYRIGHT-NOTE-END ---""" %{ "p": package, [COPY] --- SDE-COPYRIGHT-NOTE-END ---""" %{ "p": package,
't': time.strftime('%Y')}
't': time.strftime('%Y')}
desci="[I] TODO: Short Information" desci="[I] TODO: Short Information"
desct="""TODO: Long Explanation desct="""TODO: Long Explanation
TODO: Long Explanation TODO: Long Explanation
@ -78,7 +78,7 @@ categories={"admin":"extra/tool",
"web":"extra/network", "web":"extra/network",
"x11":"extra/x11" "x11":"extra/x11"
} }
# category exlucsion:reason
# category exlucsion:reason
debianpolicy="http://www.debian.org/doc/debian-policy/ch-binary" debianpolicy="http://www.debian.org/doc/debian-policy/ch-binary"
excludecat={"virtual":""" excludecat={"virtual":"""
This is a debian only package. This is a debian only package.

+ 15
- 15
lib/sde-package/new-debian.py

@ -10,26 +10,26 @@ class cParseHTML(HTMLParser):
def parse(self,string): def parse(self,string):
self.val=string self.val=string
self.feed(self.val) self.feed(self.val)
return self.val
return self.val
cParse=cParseHTML() cParse=cParseHTML()
parse=cParse.parse
parse=cParse.parse
repo=None repo=None
pkg=None pkg=None
bdescd=False bdescd=False
parser = optparse.OptionParser(usage) parser = optparse.OptionParser(usage)
parser.add_option("-b", "--base", dest="base", parser.add_option("-b", "--base", dest="base",
help="""Change base i.e from
help="""Change base i.e from
http://packages.debian.org to http://packages.ubuntu.com""") http://packages.debian.org to http://packages.ubuntu.com""")
parser.add_option("-d", "--distro",dest="distro", parser.add_option("-d", "--distro",dest="distro",
help="""chose distro i.e stable (default) testing,unstable
help="""chose distro i.e stable (default) testing,unstable
oldstable experimental etc. """) oldstable experimental etc. """)
parser.add_option("-f", "--force", parser.add_option("-f", "--force",
action="store_true", dest="force", action="store_true", dest="force",
help="""Toggle force values on/off. Default can be set in
help="""Toggle force values on/off. Default can be set in
lib/sde-download/info.py.""") lib/sde-download/info.py.""")
parser.add_option("-g", "--guess", parser.add_option("-g", "--guess",
action="store_true", dest="guess", action="store_true", dest="guess",
help="""Toggle guess values on/off. Default can be set in
help="""Toggle guess values on/off. Default can be set in
lib/sde-download/info.py.""") lib/sde-download/info.py.""")
parser.add_option("-o", "--outpkg",dest="outpkg", parser.add_option("-o", "--outpkg",dest="outpkg",
help="""Write desc to package.""") help="""Write desc to package.""")
@ -67,11 +67,11 @@ elif len(opts)==2:
else: else:
parse.error("Invalid options.") parse.error("Invalid options.")
if not repo:parser.error("Package doesn't exist.") if not repo:parser.error("Package doesn't exist.")
if not pkg:parse.error("Invalid options.")
if not pkg:parse.error("Invalid options.")
url=base + "/" + distro + "/" + repo + "/" + pkg url=base + "/" + distro + "/" + repo + "/" + pkg
try: try:
page=urllib2.urlopen(url).read() page=urllib2.urlopen(url).read()
except:
except:
print "Error: package '%s' does not exist." % sys.argv[nargs] print "Error: package '%s' does not exist." % sys.argv[nargs]
sys.exit() sys.exit()
soup = BeautifulSoup(page) soup = BeautifulSoup(page)
@ -91,7 +91,7 @@ except: pass
try: try:
desci="[I] " + parse("".join(soup("h2")[0])).capitalize()+"." desci="[I] " + parse("".join(soup("h2")[0])).capitalize()+"."
except: pass except: pass
try:
try:
desct=parse(str(soup("p")[1])) desct=parse(str(soup("p")[1]))
except: pass except: pass
lcat=soup("span") lcat=soup("span")
@ -114,7 +114,7 @@ if guess:
try: try:
license=licenses[lcat] license=licenses[lcat]
descl="[L] " + license descl="[L] " + license
except:pass
except:pass
sdesct="" sdesct=""
cnt=0 cnt=0
cnt2=0 cnt2=0
@ -150,14 +150,14 @@ formatteddesc="""%(copy)s
%(d)s %(d)s
"""%{ "copy": copy,"i": desci,"t":sdesct,"u":descu,"a":desca, """%{ "copy": copy,"i": desci,"t":sdesct,"u":descu,"a":desca,
"m":descm,"c":descc,"l":descl,"s":descs,"v":descv,"p":descp, "m":descm,"c":descc,"l":descl,"s":descs,"v":descv,"p":descp,
"d":descd}
"d":descd}
if options.outpkg: if options.outpkg:
output=options.outpkg.split("/") output=options.outpkg.split("/")
optcnt=len(output) - output.count("") optcnt=len(output) - output.count("")
out="" out=""
if optcnt == 1: if optcnt == 1:
os.system("echo -e \"\033[33;1m=>\033[0m assuming reqested repository as 'wip.'\"")
os.system("echo -e \"\033[33;1m=>\033[0m assuming reqested repository as 'wip.'\"")
out="package/wip/" +output[0]+"/"+output[0]+".desc" out="package/wip/" +output[0]+"/"+output[0]+".desc"
dir="package/wip/" +output[0] dir="package/wip/" +output[0]
if os.path.isdir(dir): if os.path.isdir(dir):
@ -178,18 +178,18 @@ if options.outpkg:
if os.path.isfile(out): if os.path.isfile(out):
print "failed\n package %(p)s belongs to %(c)s!" %{"p":output[1], print "failed\n package %(p)s belongs to %(c)s!" %{"p":output[1],
"c":output[0]} "c":output[0]}
sys.exit(1)
sys.exit(1)
else: else:
os.mkdir(dir) os.mkdir(dir)
else:parser.error("Inavlid Option for --outpkg (-o)") else:parser.error("Inavlid Option for --outpkg (-o)")
try: try:
os.system("echo -n 'Writing desc to file...'") os.system("echo -n 'Writing desc to file...'")
outf=open(out,"w") outf=open(out,"w")
outf.write(formatteddesc)
outf.write(formatteddesc)
outf.close() outf.close()
os.system("echo 'ok'") os.system("echo 'ok'")
except: except:
print"Error writing to file " + out
print"Error writing to file " + out
if bdescd: if bdescd:
os.system("echo -n 'Patching cksum...'") os.system("echo -n 'Patching cksum...'")
if os.popen("sde pkg up " + output[len(output)-1]+"&>/dev/null"): if os.popen("sde pkg up " + output[len(output)-1]+"&>/dev/null"):

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save