diff --git a/doc/HISTORY b/doc/HISTORY index 1c086d6..0a5c014 100644 --- a/doc/HISTORY +++ b/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 developers. OpenSDE, then two months later, after personal and many 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. The SDE concept is intended as an open framework to build an operating system (not necessarily restricted to GNU/Linux) enabling the creation 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 where decisions are made based on their technical merit uninfluenced diff --git a/doc/LIB64-UGLY-HACKED-PACKAGES b/doc/LIB64-UGLY-HACKED-PACKAGES index 36394ac..8f88e7d 100644 --- a/doc/LIB64-UGLY-HACKED-PACKAGES +++ b/doc/LIB64-UGLY-HACKED-PACKAGES @@ -1,6 +1,6 @@ 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 ----------- --------------------------------------------------------- diff --git a/doc/PKG-BUILD-VARS b/doc/PKG-BUILD-VARS index dae3c58..084c722 100644 --- a/doc/PKG-BUILD-VARS +++ b/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 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 if a package is not pkgfork'd, pkg == xpkg ver ........... package Version (from *.desc - until first whitespace) diff --git a/doc/files/LICENSE-WARNING b/doc/files/LICENSE-WARNING index efa8e18..09d2d1d 100644 --- a/doc/files/LICENSE-WARNING +++ b/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 any liability for the mis-use of their efforts to provide a flexible system development environment respective distribution build kit. - + The developers have added resonable checks to make sure, the integrator is aware of the licensing issues involved with this distribution. diff --git a/doc/old/CHANGELOG-1999 b/doc/old/CHANGELOG-1999 index 9055c35..5be4df7 100644 --- a/doc/old/CHANGELOG-1999 +++ b/doc/old/CHANGELOG-1999 @@ -709,7 +709,7 @@ *) 1999-07-29 (1.0b13 - 1.0b14) - 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/*) - 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 diff --git a/doc/old/CHANGELOG-2000 b/doc/old/CHANGELOG-2000 index f5853ac..9c62d4d 100644 --- a/doc/old/CHANGELOG-2000 +++ b/doc/old/CHANGELOG-2000 @@ -442,7 +442,7 @@ *) 2000-07-29 (1.3.10 - 1.3.11) - 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 *) 2000-07-26 (1.3.10 - 1.3.11) @@ -484,7 +484,7 @@ - Homepage: added CHANGELOG archive with weekly summaries - Changed directory tree of binary distribution (rock--/*) - 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//lib) - 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, 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) diff --git a/doc/old/CHANGELOG-2001 b/doc/old/CHANGELOG-2001 index 83dd31b..16abd03 100644 --- a/doc/old/CHANGELOG-2001 +++ b/doc/old/CHANGELOG-2001 @@ -635,7 +635,7 @@ *) 2001-03-01 (1.3.11 - 1.5.12) - 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), fixed netpbm (fixed path of perl in 'configure') - DagB: updated misc/linux/00-hotfixes.patch diff --git a/doc/old/CHANGELOG-2002 b/doc/old/CHANGELOG-2002 index 4a4c4bc..2432134 100644 --- a/doc/old/CHANGELOG-2002 +++ b/doc/old/CHANGELOG-2002 @@ -578,7 +578,7 @@ *) 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 *) 2002-08-18 (1.5.12 - 1.7.0) @@ -590,7 +590,7 @@ *) 2002-08-17 (1.5.12 - 1.7.0) - 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 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, 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, 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 @@ -1275,7 +1275,7 @@ *) 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) - Improved the automatic creation of the kernel config - Added midimountain and spiralsynthmodular in extra2 diff --git a/doc/old/CHANGELOG-2003 b/doc/old/CHANGELOG-2003 index 284a515..1f4d9dc 100644 --- a/doc/old/CHANGELOG-2003 +++ b/doc/old/CHANGELOG-2003 @@ -116,7 +116,7 @@ - Alejandro Mery: updated mono, mono-doc, mono-debugger, mono-xsp, mod_mono, gtk-sharp added links package - updated cron and fix bind + updated cron and fix bind - updated subversion (0.34.0) - added default bdb selection to the apache config.in (defaults to 42) - added ifplugd (and so libdaemon) @@ -528,7 +528,7 @@ - fixed xjdic23 to build correclty and for random return value e.g. PowerPC - Andreas V. Meier: added avm/aalib - 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 the code with a post-flist solution which works more package independet and allows the adaption of the .la files @@ -863,7 +863,7 @@ - Sebastian Jaenicke: updated bsd-games and ircii - Dimitar Zhekov: updated jimmy repository and added xfce4 repository - Alejandro Mery: boehm-gc - complete integration - + *) 2003-09-01 (2.0.0-rc1 - 2.0.0-rc2) [RENE] - updated wv2 and koffice @@ -926,7 +926,7 @@ - Juergen Sawinski: isdn4k-utils, ifhp, aspell, units and raidtools for e.g. gcc33 - 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 - Sebastian Jaenicke: slrn @@ -1078,12 +1078,12 @@ *) 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] - 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 *) 2003-08-06 (2.0.0-beta7 - 2.0.0-rc1) [RENE] @@ -1128,7 +1128,7 @@ - powerpc and shared kernel config tweaks - yaboot documentaion copy and special rs6k file preparations - linux24.conf special ppc handling (for rs6k) - + *) 2003-08-02 (2.0.0-beta7 - 2.0.0-rc1) [RENE] - 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] - 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 keepalived and shadow - Stefan Paletta: fixed lvm prefix, lynx path encoding, ipv6 libcap, lesstif @@ -1189,7 +1189,7 @@ - Sebastian Jaenicke: fixed sendmail (rmail) - Alan J. Wylie: improved 00-update to process the info pages correctly - added ARM architecture definitions - + *) 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) @@ -1203,7 +1203,7 @@ - x86_64 (AMD 64) restructuring and fixing - Alejandro Mery: mnemoc repository update - Chris Sirkull: fixed dansguardian - - fake: added rsynth + - fake: added rsynth - Miguel A. Bolanos: renamed some 2.5 kernel strings to 2.6 - Piotr Esden-Tempski: esden repository update Create-SrcTar create the download/INDEX if needed @@ -1223,7 +1223,7 @@ - Juergen Sawinski: updates and fixes for libgda, libgnomedb and mergeant - Daniel Pischl: updated gaim - Piotr Esden-Tempski: updated and so fixed nfs-utils - + *) 2003-07-23 (2.0.0-beta7 - 2.0.0-rc1) [RENE] - fixed linux* cross compilation for all architectures @@ -1233,7 +1233,7 @@ - Dimitar Zhekov: fixed eject to not install i18n files when NLS is disabled - Stefan Paletta: added bluetooth definitions to default modules.conf improved the bluez packages - + *) 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 @@ -1304,7 +1304,7 @@ - Stefan Paletta: really fixed openh323 to not install CVS dirs - Chris Sirkull: fixed mysql init script - Sandra Dismar: added zsh and openbox - + *) 2003-07-17 (2.0.0-beta7 - 2.0.0-rc1) [RENE] - Dimitar Zhekov: updated terminus-font and zgv @@ -1319,8 +1319,8 @@ *) 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] @@ -1384,7 +1384,7 @@ - fill some Documentation gaps - Alejandro Mery: some fixed for rsbac - Dimitar Zhekov: gtk+1 font hack - + *) 2003-07-08 (2.0.0-beta6 - 2.0.0-beta7) [RENE] - Alejandro Mery: various mnemoc updates @@ -1397,7 +1397,7 @@ - updated xfree86 - fixed linux25 config creation and powerpc kernel configs - Alejandro Mery: enabled imap in mutt, updated /etc/services and - fixed openssh + fixed openssh - Miguel A. Bolanos: updated several alessandro packages updated and added several gnome2 packages updated lilo and several x11 packages @@ -1454,7 +1454,7 @@ an non-ROCK init script - Alan J. Wylie: updated libgsf for gnumeic - fixed system.int to register /sbin/rockplug as hotplug agent - + *) 2003-06-30 (2.0.0-beta6 - 2.0.0-beta7) [RENE] - updated tex-ttf @@ -1472,7 +1472,7 @@ *) 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 - Miguel A. Bolanos: updated groff - Stefan Paletta and Dimitar Zhekov: man, groff, less and mc various fixes @@ -1550,10 +1550,10 @@ - updated linux25* - Alejandro Mery: sysv_nice cleanup - Chris Sirkull: updated clamav - + *) 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 and useability patches) - fixed linux24benh kernel to export yet-another-symbol MOL needs @@ -1590,7 +1590,7 @@ - version bump - Alessandro Ferrari: updated ifenslave - - Chris Sirkull: updated dansguard + - Chris Sirkull: updated dansguard - fixed kdebase31 to install all files I added weeks ago - updaded subversion (0.24 was left out intentionally - since it was official declared buggy ...) @@ -1677,7 +1677,7 @@ - bootdisk target work for conditional packages per architecture, a logo for the ppc greeting and a dynamic fdisk-style app detection for the mod_install (STONE module) - - Mathieu: updated mldonkey + - Mathieu: updated mldonkey *) 2003-06-09 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD] @@ -1691,13 +1691,13 @@ - Stefan Paletta: legal crap package/{x11,rene} - Benjamin Schieder: nethack cleanup, fix qt typo and add subconfig-*.hlp added libraw1394, libavc1394, dvgrab and kino - + *) 2003-06-07 (2.0.0-beta3 - 2.0.0-beta4) [RENE] - fixed / improved samba .init scripts - Miguel A. Bolanos: added rockplug to bootdisk - 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 - since now multiple kernels are supported made linux25 build by default - 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] - 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 - cleanup of devfsd.conf and added v4l devfsd.d conf - added a useful default for the "Times" font. @@ -1755,7 +1755,7 @@ *) 2003-05-30 (2.0.0-beta3 - 2.0.0-beta4) [RENE] - Miguel A. Bolanos: fixed bacterium and uucp - updated uucp + updated uucp - Mathieu: updating mldonkey to 2.5, adding duplicity (and librsync as a dependency) - Stefan Gutschireiter: fixed curl @@ -1776,7 +1776,7 @@ - Benjamin Schieder: blindcoder rep, freedroid - Kai: improved freedroid_rpg - 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 *) 2003-05-26 (2.0.0-beta2 - 2.0.0-beta3) [RENE] @@ -1786,12 +1786,12 @@ - Clifford Wolf: [Patch] 200305261154 *) 2003-05-25 (2.0.0-beta3 - 2.0.0-beta4) [CLIFFORD] - + - Added new *.cache files from latest reference build - Moved 'missing or wrong file detection' from target/generic to Built-Target - Multiple importand fixes to 'missing or wrong file detection' - Fixed mine.conf for real cross-building between architectures - + *) 2003-05-25 (2.0.0-beta2 - 2.0.0-beta3) [RENE] - stoned mac_hid configuration and init script @@ -1829,13 +1829,13 @@ - updated xemacs-packages (for the rolling issue textual example ;-) *) 2003-05-22 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD] - + - Alessandro Ferrari: Cleanups in perl5.conf - 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 linux-drm package and disabled drm drivers in standard kernel - Fixed cross-building mine (in stages 0 and 1) - + *) 2003-05-21 (2.0.0-beta2 - 2.0.0-beta3) [RENE] - Alejandro Mery: psmics fix for gcc33 @@ -1877,7 +1877,7 @@ - fixed mozilla - updated alsaplayer kde* - corrected gcc3's parse-config so it doe set CC correctly - + *) 2003-05-18 (2.0.0-beta2 - 2.0.0-beta3) [CLIFFORD] - 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] - 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 gtkhtml, fixed bzflag - Sebastian Jaenicke: updated ethereal and nessus @@ -2620,7 +2620,7 @@ - Rene Rebe: Updated GNOME to 2.2 and removed some outdated packages - Rene Rebe: Fixed some gnome and kde packages - Rene Rebe: Added gcc-snapshot for regression tests - - Moved package/(.*?)-(.*?)/ to package/$1$2/ + - Moved package/(.*?)-(.*?)/ to package/$1$2/ - Various bootdisk target cleanups *) 2003-03-09 (1.5.12 - 1.7.0) [RENE] @@ -2693,13 +2693,13 @@ - simplified cyrus-sasl config - updated qt (3.1.2) and fixed xfree to not install the deprecated XftConfig - 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 - Alejandro Mery: added rsbac - Kai Schwenzfeier: added directfb, libsdl_perl, dfbsee, frozen-bubble - 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 - fixed kdelibs-31/config.in to check for the correct package - updated sodipodi @@ -2730,14 +2730,14 @@ *) 2003-03-05 (1.5.12 - 1.7.0) [RENE] - 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 - Alejandro Mery: added rsbac - niteblade: added directfb, libsdl_perl, dfbsee, frozen-bubble, - xarchon, xskat + xarchon, xskat - 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 *) 2003-03-04 (1.5.12 - 1.7.0) [RENE] @@ -2834,7 +2834,7 @@ - various rene repository changed incl. renaming the microsoft fonts package, adding the new bitstream-vera-fonts, ... - fixed xfree86 to create the TrueType font-dir - - more desktop target kernel work + - more desktop target kernel work - Merged various patches from the ML: - Sebastian Jaenicke: updated galeon and various tsa repository updates - 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, adding the new bitstream-vera-fonts, ... - fixed xfree86 to create the TrueType font-dir - - more desktop target kernel work + - more desktop target kernel work - Merged various patches from the ML: - Sebastian Jaenicke: updated galeon and various tsa repository updates - Alejandro Mery: updated ccache-2.2, procps-3.1.6 and pkgconfig-0.15e diff --git a/doc/sde-wrapper.txt b/doc/sde-wrapper.txt index 9334dc1..3ef76c4 100644 --- a/doc/sde-wrapper.txt +++ b/doc/sde-wrapper.txt @@ -5,7 +5,7 @@ # Grab package files # sde download -all # Download every file from the tree - [-cfg $config] $pkg [$pkg [...]] + [-cfg $config] $pkg [$pkg [...]] # Downloads specific packages and their active extenders -cfg $config # Download all the files required by a given config -help # Shows some help diff --git a/etc/desc_format b/etc/desc_format index 5bc2ee0..005285b 100644 --- a/etc/desc_format +++ b/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 file. - - Clifford and Rene + - Clifford and Rene ---- @@ -143,7 +143,7 @@ file. Format: [SRC] tarball1 tarball2 This will enable build_this_package to build the content of more than 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. NOTE2: a pattern to match the needed tarball should be enough. (example: @@ -151,6 +151,6 @@ file. > [D] cksum mypkg-gfx-version2.tbz2 http://some.url.tld > [D] cksum mypkg-data-version3.tar.bz2 http://some.url.tld > [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. diff --git a/etc/download.sed b/etc/download.sed index 102cf80..f141986 100644 --- a/etc/download.sed +++ b/etc/download.sed @@ -1,13 +1,13 @@ #!/bin/sed # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: etc/download.sed # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2005 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/core-functions.in b/lib/core-functions.in index 1de02ae..22e092c 100644 --- a/lib/core-functions.in +++ b/lib/core-functions.in @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/core-functions.in # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/functions.in b/lib/functions.in index ec7492e..5649fed 100644 --- a/lib/functions.in +++ b/lib/functions.in @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/functions.in # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -64,7 +64,7 @@ atstage() { local x= for x; do case "$x" in - toolchain) + toolchain) [ $stagelevel -gt 0 ] || return 0 ;; cross|crossbuild|crosscompile) [ $stagelevel -ne 1 ] || return 0 ;; @@ -142,7 +142,7 @@ hook_dump() { for hook in ${!hookidx_*} ; do hook=${hook#hookidx_} echo ; echo "Contents of hook $hook:" - + while read pri fnr ; do echo ; echo " $pri ($fnr)" echo "${hook_functions[fnr]}" | sed 's,^, ,' @@ -206,7 +206,7 @@ set_confopt() { # bindir=/usr/bin eval "$x=`pkggetdir $x`" # --bindir=$root\$bindir - confopt="$confopt --$x=$z\$$x" + confopt="$confopt --$x=$z\$$x" done @@ -261,7 +261,7 @@ function eval_config_command() { EOT for x in $configcache; do echo "$x" - done + done fi >> $config_cache grep -q '.--cache-file=' $configscript && @@ -370,7 +370,7 @@ postflist_static_lib() { deplib="`echo $deplib | sed "s,/lib$,/$libsub,g; s,/lib/,/$libsub/,g"`" ;; esac - fi + fi case "$deplib" in *TOOLCHAIN*|*BACKUP*|*$SDECFG_ID*) ;; @@ -378,7 +378,7 @@ postflist_static_lib() { dlibtmp=$dlibsnew ; var_remove dlibtmp ' ' "$deplib" [ "$dlibtmp" = "$dlibsnew" ] && var_append dlibsnew ' ' "$deplib" ;; - + esac done @@ -577,7 +577,7 @@ pkgprefix() { if [ "$1" = "-t" ]; then dotest=1; shift fi - + if [ $# -eq 2 ]; then type="$1"; shift 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 # func that knows how to extract the archive. However, every func # should deliver two file: untar.txt and xsrcdir.txt. @@ -797,13 +797,13 @@ apply_patchfiles() { autoextract_tar_bz2() { echo "Extracting $xsrctar ($taropt) ... " - tar -v $taropt $1 > untar.txt + tar -v $taropt $1 > untar.txt } autoextract_zip() { echo "Extracting $xsrctar ($zipopt) ... " 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 @@ -842,13 +842,13 @@ build_this_package() { # autoextraction to use. case "$xsrctar" in *.zip) custextract="autoextract_zip" ;; - *) custextract="autoextract_tar_bz2" ;; # *.tar.bz2|*.tbz2|*.tbz + *) custextract="autoextract_tar_bz2" ;; # *.tar.bz2|*.tbz2|*.tbz esac fi if [ -n "$custextract" ]; then # Do the actual extraction of the archive. eval "$custextract $archdir/$xsrctar" - cat untar.txt | + cat untar.txt | sed 's,^\./,,' | cut -f1 -d/ | sort -u > xsrcdir.txt fi @@ -887,10 +887,10 @@ build_this_package() { cd $builddir/$xsrcdir # Apply patches - # + # if [ $autopatch = 1 ]; then hook_eval prepatch - apply_patchfiles + apply_patchfiles hook_eval postpatch fi @@ -908,7 +908,7 @@ build_this_package() { fi done fi - + if [ -z "$custmain" ]; then while [ ${buildloop:-1} -le ${buildloops:-1} ]; do [ "${buildloops:-1}" = "1" ] || echo "loop ${buildloop:-1} of ${buildloops:-1} for $xsrctar." @@ -934,7 +934,7 @@ build_this_package() { fi # Run configure scripts etc. # - if [ $runconf = 1 ]; then + if [ $runconf = 1 ]; then if [ -n "$( type -p $configscript )" -o $autogen = 1 ] then eval_config_command $( eval echo $confopt ) @@ -1030,7 +1030,7 @@ build_this_package() { fi patchfiles="$saved_patchfiles" done - + if [ "$rmemptydir" ]; then rmdir $rmemptydir 2> /dev/null || true fi @@ -1049,12 +1049,12 @@ source_file() { # '-' as $url prefix means, nomirrorable [ "${url:0:1}" = "-" ] && mirror="local" - + # inside Build-Pkg $archdir is set if [ -n "$archdir" ]; then pre=$base/; file="$( bz2filename $file )" fi - + echo ${pre}download/${mirror}/${file:0:1}/$file } @@ -1218,7 +1218,7 @@ build_package() 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 # to the loaded script. set -- diff --git a/lib/init/formats/tail.in b/lib/init/formats/tail.in index e73c6cc..2ac8810 100644 --- a/lib/init/formats/tail.in +++ b/lib/init/formats/tail.in @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/formats/tail.in # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -37,7 +37,7 @@ tail_read() { output="$( grep -e "^$query" $file | cut -f$count- )" [ "$verbose" ] && echo "$output" - + grep -q -e "^$query" $file } @@ -50,7 +50,7 @@ tail_install() { runit) local servicedir=$( echo `eval echo $1` ) local runprefix= - + mkdir -vp "$servicedir" rm -f /tmp/tail.$$ @@ -108,7 +108,7 @@ tail_install() { # if tail_read -q $tailfile log; then mkdir -vp "$servicedir/log/main" - + if [ -z "$logdir" ]; then if [ "${localstatedir%$pkg}" != "$localstatedir" ]; then logdir=$localstatedir/log @@ -117,7 +117,7 @@ tail_install() { fi fi - z= + z= for x in `tail_read $tailfile log | cut -f1 | sort -u`; do echo "TAIL: ./log/$x" mkdir -vp $root/$logdir/$x @@ -138,7 +138,7 @@ tail_install() { EOT chmod +x "$servicedir/log/run" fi - + ;; *) abort "tail_install: unknown style '$style' for $tailfile." diff --git a/lib/init/install_cron.in b/lib/init/install_cron.in index 8de3518..4e1441d 100644 --- a/lib/init/install_cron.in +++ b/lib/init/install_cron.in @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/install_cron.in # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/init/install_desktop.in b/lib/init/install_desktop.in index 5dd071e..4b66a69 100644 --- a/lib/init/install_desktop.in +++ b/lib/init/install_desktop.in @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/install_desktop.in # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/init/install_init.in b/lib/init/install_init.in index bda5c13..04711eb 100644 --- a/lib/init/install_init.in +++ b/lib/init/install_init.in @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/install_init.in # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/init/install_postinstall.in b/lib/init/install_postinstall.in index 5832344..2b71078 100644 --- a/lib/init/install_postinstall.in +++ b/lib/init/install_postinstall.in @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/install_postinstall.in # Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/init/parse-config b/lib/init/parse-config index 979396e..55e5965 100644 --- a/lib/init/parse-config +++ b/lib/init/parse-config @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/init/parse-config # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/jailing/config.hlp b/lib/jailing/config.hlp index 3f79b94..87633ed 100644 --- a/lib/jailing/config.hlp +++ b/lib/jailing/config.hlp @@ -1,12 +1,12 @@ # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/jailing/config.hlp # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/jailing/config.in b/lib/jailing/config.in index 3a39cf5..b77e29e 100644 --- a/lib/jailing/config.in +++ b/lib/jailing/config.in @@ -1,13 +1,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/jailing/config.in # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/jailing/dbmail-db-header-path.patch b/lib/jailing/dbmail-db-header-path.patch index ed4d918..6d4a39d 100644 --- a/lib/jailing/dbmail-db-header-path.patch +++ b/lib/jailing/dbmail-db-header-path.patch @@ -1,12 +1,12 @@ # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/jailing/dbmail-db-header-path.patch # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # 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 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms @@ -24,12 +24,12 @@ - mysqlheadername="$withval" + mysqlheadername="$withval/include/mysql" fi - + # Check whether --with-pgsql or --without-pgsql was given. if test "${with_pgsql+set}" = set; then withval="$with_pgsql" - pgsqlheadername="$withval" + pgsqlheadername="$withval/include" fi - - + + diff --git a/lib/jailing/package-functions b/lib/jailing/package-functions index 231db47..75fccac 100644 --- a/lib/jailing/package-functions +++ b/lib/jailing/package-functions @@ -1,37 +1,37 @@ # --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# +# # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# +# # ROCK Linux: rock-src/misc/jailing/package-functions # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. A copy of the GNU General Public # License can be found at Documentation/COPYING. -# +# # Many people helped and are helping developing ROCK Linux. Please # have a look at http://www.rocklinux.org/ and the Documentation/TEAM # file for details. -# +# # --- ROCK-COPYRIGHT-NOTE-END --- jail_pkg_apache_postmake() { jail_ensure_users http ### Updates paths in $root/$jail/$datadir/build/config_vars.mk - + echo "Updateing paths in $root/$jail/$datadir/build/config_vars.mk" tmp=`mktemp` # A copy of original config_vars.mk is left for reference cp $root/$jail/$datadir/build/config_vars.mk \ $root/$jail/$datadir/build/config_vars.mk.orig - + cp -f $root/$jail/$datadir/build/config_vars.mk $tmp # 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 ### Updates paths in $root/$jail/$sbindir/apxs - + echo "Updateing paths in $root/$jail/$sbindir/apxs" cp -f $root/$jail/$sbindir/apxs $tmp sed "s|/usr/share/build|/$jail/$datadir/build|" < $tmp \ diff --git a/lib/jailing/parse-config b/lib/jailing/parse-config index a605c26..25482ff 100644 --- a/lib/jailing/parse-config +++ b/lib/jailing/parse-config @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/jailing/parse-config # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -75,7 +75,7 @@ jail_samejail() { if [ "${SDECFG_JAILING}" = 1 ] ; then [ "$pkg" = php ] && jail_samejail php apache [ "$pkg" = subversion ] && jail_samejail subversion apache - + if eval "[ \"\${SDECFG_JAILING_$pkg}\" = 1 ]" ; then . $base/lib/jailing/jail-functions . $base/lib/jailing/package-functions @@ -85,7 +85,7 @@ if [ "${SDECFG_JAILING}" = 1 ] ; then eval "export jail=\"\${SDECFG_JAILDIR_$pkg}\"" case "$pkg" in - # Setting destvar + # Setting destvar postfix) destvar='install_root' ;; php) destvar='INSTALL_ROOT' ;; *) destvar='DESTDIR' ;; diff --git a/lib/jailing/postsysfiles.in b/lib/jailing/postsysfiles.in index 9754653..1d1781a 100644 --- a/lib/jailing/postsysfiles.in +++ b/lib/jailing/postsysfiles.in @@ -1,12 +1,12 @@ # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/jailing/postsysfiles.in # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/libsde.in b/lib/libsde.in index 1ffba89..ac34cdd 100644 --- a/lib/libsde.in +++ b/lib/libsde.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/libsde.in # Copyright (C) 2006 - 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/lua/lzlib/lzlib.c b/lib/lua/lzlib/lzlib.c index a36a077..a9d0d55 100644 --- a/lib/lua/lzlib/lzlib.c +++ b/lib/lua/lzlib/lzlib.c @@ -1,13 +1,13 @@ /* * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/lua/lzlib/lzlib.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -27,7 +27,7 @@ #define ZLIB_HANDLE "gzFile" -// ------------------- helper functions ------------------------ +// ------------------- helper functions ------------------------ // pushes gzFile operation result string on lua stack @@ -84,7 +84,7 @@ size_t content_buffer_length = 0; size_t content_length = 0; static inline void ResetBuffer () -{ +{ content_length = 0; } @@ -123,7 +123,7 @@ static inline int BufferFill () return content_length; } -static inline int BufferFree () +static inline int BufferFree () { 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') - + lua_pushstring (L, FinishBuffer ()); return 1; } else { diff --git a/lib/lua/lzlib/zlibtest.lua b/lib/lua/lzlib/zlibtest.lua index efe3462..0823843 100644 --- a/lib/lua/lzlib/zlibtest.lua +++ b/lib/lua/lzlib/zlibtest.lua @@ -1,12 +1,12 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/lzlib/zlibtest.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -23,7 +23,7 @@ if not zf then -- failed to open file, print error else lines = zf:lines(); -- obtain line iterator - for x in lines do -- output contents + for x in lines do -- output contents print (x); end diff --git a/lib/lua/parse-db.lua b/lib/lua/parse-db.lua index cc364d4..2e4cd92 100644 --- a/lib/lua/parse-db.lua +++ b/lib/lua/parse-db.lua @@ -1,12 +1,12 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/parse-db.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -77,7 +77,7 @@ else if lines() ~= "\004" then -- separator line print ("terminating line missing\n"); end - + packages[pkgname] = pkg_data; end until pkgname == nil; diff --git a/lib/lua/parse-desc.lua b/lib/lua/parse-desc.lua index 74f420c..c3837e7 100644 --- a/lib/lua/parse-desc.lua +++ b/lib/lua/parse-desc.lua @@ -1,13 +1,13 @@ #!/usr/bin/env lua -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/parse-desc.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -15,7 +15,7 @@ -- --- SDE-COPYRIGHT-NOTE-END --- -- try this: --- +-- -- 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 diff --git a/lib/lua/sde/desc.lua b/lib/lua/sde/desc.lua index 85752d7..707686d 100644 --- a/lib/lua/sde/desc.lua +++ b/lib/lua/sde/desc.lua @@ -1,13 +1,13 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/sde/desc.lua -- Copyright (C) 2006 - 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -37,7 +37,7 @@ function desc.parse(iter) local retval = {} -- FIXME: Perhaps we'll gain some performance by not reading - -- line by line + -- line by line for line in io.open(iter):lines() do local tag,cnt @@ -77,7 +77,7 @@ for line in io.open("etc/desc_format"):lines() do tag = string.lower(tag) -- sort into __format__ - for t in string.gfind(line,"([[][^]]*[]])") do + for t in string.gfind(line,"([[][^]]*[]])") do desc.__format__[t] = { name = tag; required = required } end end diff --git a/lib/lua/sde/getopt.lua b/lib/lua/sde/getopt.lua index 99f99a3..7e33184 100644 --- a/lib/lua/sde/getopt.lua +++ b/lib/lua/sde/getopt.lua @@ -1,13 +1,13 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/sde/getopt.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -23,29 +23,29 @@ -- Parses the "arg-list" according to "option-definition" and -- returns the parsed options "opts", additional arguments "args" and -- possibly an error. --- +-- -- Option definition format: -- key Option key (e.g. key = "help") -- option String or list of options (e.g. option = {"-h", "--help"}) -- default Default value (e.g. default = false) -- argument This option has no argument (ARG.none), a required -- argument (ARG.required) or an optional argument (ARG.optional) --- flag The option is flagged: +-- flag The option is flagged: -- number (OPT.number) -- incremental (OPT.incremental) -- Example: see below -ARG = { - none = 0, +ARG = { + none = 0, required = 1, - optional = 2 + optional = 2 } OPT = { none = 0, string = 0, number = 1, - --boolean = 2, + --boolean = 2, incremental = 10, } @@ -56,17 +56,17 @@ function getopt(args,def) -- first pass: defaults for _,d in pairs(def) do - if d.default ~= nil then + if d.default ~= nil then opt[d.key] = d.default end end -- Second pass: parse arguments - local i=1 + local i=1 repeat for _,d in pairs(def) do local found = false - + -- FIXME is there some shorter version for this: if type(d.option) == "string" then if d.option == args[i] then found=true end @@ -77,31 +77,31 @@ function getopt(args,def) end end end - + -- process option and arguments if found then local val = true local nextisopt = false local havearg = false - + -- check if next is an argument (not option) if args[i+1] and string.sub(args[i+1],1,1) == "-" then nextisopt = true end - + -- option argument ? if nextisopt and d.argument == ARG.required then return nil, nil, "Missing option argument for `" .. args[i] .. "'" end - + if not nextisopt and - (d.argument == ARG.required + (d.argument == ARG.required or d.argument == ARG.optional) then - args[i] = nil + args[i] = nil i = i+1 - + val = args[i] - + havearg = true end diff --git a/lib/lua/sde/hooks.lua b/lib/lua/sde/hooks.lua index 8283c26..caf41e6 100644 --- a/lib/lua/sde/hooks.lua +++ b/lib/lua/sde/hooks.lua @@ -1,13 +1,13 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/sde/hooks.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 Juergen "George" Sawinski --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the @@ -37,9 +37,9 @@ -- Run a specific hook level -- -- Access without hook level: --- h:add(function-or-string) +-- h:add(function-or-string) -- Equivalent to h[5]:add(function-or-string) --- +-- -- h:set(function-or-string) -- Equivalent to h[5]:set(function-or-string), however, clears -- all other levels @@ -106,7 +106,7 @@ function __hook.add(h, data) local f = loadstring(data) table.insert(h.hooks, f) else - assert(type(data) == "function", + assert(type(data) == "function", "function or string expected in hook.add(table, pos, function-or-string)") end end diff --git a/lib/lua/sde/pkgdb.lua b/lib/lua/sde/pkgdb.lua index ae6a3b6..01a1941 100644 --- a/lib/lua/sde/pkgdb.lua +++ b/lib/lua/sde/pkgdb.lua @@ -1,13 +1,13 @@ -- --- SDE-COPYRIGHT-NOTE-BEGIN --- -- This copyright note is auto-generated by ./scripts/Create-CopyPatch. --- +-- -- Filename: lib/lua/sde/pkgdb.lua -- Copyright (C) 2008 The OpenSDE Project -- Copyright (C) 2005 - 2006 The T2 SDE Project -- Copyright (C) 2005 - 2006 Valentin Ziegler, Juergen "George" Sawinski --- +-- -- More information can be found in the files COPYING and README. --- +-- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/AuditBuild.sh b/lib/misc/AuditBuild.sh index 667497d..6fcc711 100755 --- a/lib/misc/AuditBuild.sh +++ b/lib/misc/AuditBuild.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/AuditBuild.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/GenDepGraph.sh b/lib/misc/GenDepGraph.sh index b670756..dfdfa59 100755 --- a/lib/misc/GenDepGraph.sh +++ b/lib/misc/GenDepGraph.sh @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/GenDepGraph.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/PackBuildInfo.sh b/lib/misc/PackBuildInfo.sh index 3371634..6f58ce2 100755 --- a/lib/misc/PackBuildInfo.sh +++ b/lib/misc/PackBuildInfo.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/PackBuildInfo.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/RegressionsReport.sh b/lib/misc/RegressionsReport.sh index 77d6640..857ffea 100755 --- a/lib/misc/RegressionsReport.sh +++ b/lib/misc/RegressionsReport.sh @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/RegressionsReport.sh # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -15,7 +15,7 @@ # --- SDE-COPYRIGHT-NOTE-END --- config=default TARGET=regressions -revision=`svn info | sed -n 's,^Revision: \(.*\),\1,p'` +revision=`svn info | sed -n 's,^Revision: \(.*\),\1,p'` if [ "$1" = "-cfg" ]; then config="$2"; shift 2 diff --git a/lib/misc/adddownload.sh b/lib/misc/adddownload.sh index 09ae080..ad6eabb 100644 --- a/lib/misc/adddownload.sh +++ b/lib/misc/adddownload.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/adddownload.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/apply-patch.sh b/lib/misc/apply-patch.sh index d285ce7..f59be9f 100644 --- a/lib/misc/apply-patch.sh +++ b/lib/misc/apply-patch.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/apply-patch.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/bash-xterm.patch b/lib/misc/bash-xterm.patch index 021f232..fd08bb8 100644 --- a/lib/misc/bash-xterm.patch +++ b/lib/misc/bash-xterm.patch @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/bash-xterm.patch # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # 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 # 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 @@ # include "../bashhist.h" #endif - + -extern int interactive; +extern int interactive, xterm_mode; 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 }, { (char *)NULL, (int *)NULL } }; - + 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/execute_cmd.c Sun Apr 8 12:49:23 2001 @@ -98,7 +98,7 @@ # include "bashhist.h" #endif - + -extern int posixly_correct; +extern int posixly_correct, xterm_mode; 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); + FREE(txt); fflush(stderr); + } - + first_word_quoted = simple_command->words ? (simple_command->words->word->flags & W_QUOTED): 0; 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 @@ int brace_expansion = 1; #endif - + +/* Non-zero means that the shell prints xterm escape codes for creating + a new title text before printing the promt and before exetucing a + command. */ @@ -116,7 +116,7 @@ diff -ruN bash-2.04-orig/parse.y bash-2.04/parse.y extern int bash_input_fd_changed; #endif +extern int xterm_mode; - + extern int errno; /* **************************************************************** */ @@ -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. */ static char *current_decoded_prompt; +static char *current_decoded_ps1_prompt; - + /* The number of lines read from input while creating the current command. */ int current_command_line_count; @@ -975,6 +977,10 @@ interrupt_immediately++; } - + + if (xterm_mode) fprintf(stderr, "\033]0;%s\007", + current_decoded_ps1_prompt ? + current_decoded_ps1_prompt : "bash"); + current_readline_line = readline (current_readline_prompt ? current_readline_prompt : ""); - + @@ -3421,6 +3427,10 @@ ps1_prompt = get_string_value ("PS1"); ps2_prompt = get_string_value ("PS2"); - + + FREE (current_decoded_ps1_prompt); + current_decoded_ps1_prompt = ps1_prompt ? + decode_prompt_string (ps1_prompt) : (char *)NULL; + if (!prompt_string_pointer) prompt_string_pointer = &ps1_prompt; - + @@ -3468,6 +3478,8 @@ static void print_prompt () diff --git a/lib/misc/cacheinjector.sh b/lib/misc/cacheinjector.sh index 6a88698..7937a9f 100755 --- a/lib/misc/cacheinjector.sh +++ b/lib/misc/cacheinjector.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/cacheinjector.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -27,7 +27,7 @@ fi 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;'" -echo package/*/*/ | tr ' ' '\n' | +echo package/*/*/ | tr ' ' '\n' | sed -e "s,^\(.*\)/\(.*\)/\(.*\)/,\3 build/$SDECFG_ID/var/adm/cache/\3 \1/\2/\3/\3.cache," | while read pkg new original; do if [ -f $new ]; then diff --git a/lib/misc/catedit.sh b/lib/misc/catedit.sh index 7dd7c57..a03c850 100755 --- a/lib/misc/catedit.sh +++ b/lib/misc/catedit.sh @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/catedit.sh # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -23,7 +23,7 @@ set -e -item='' +item='' tmp=$( mktemp ) if [ $(dialog --version 2>&1| grep -c "0.9") -eq 0 ]; then @@ -53,7 +53,7 @@ do for file in $files; do [[ $file = */$item.desc ]] && break done - + (for category in $(awk '/^[^# ]/ {print $1}' < etc/categories ); do echo -n $category $category if [ -n "$(grep "^\[C\].*$category" $file )" ] @@ -67,11 +67,11 @@ do 42 80 35 $(cat $tmp) 2> $tmp 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 $tmp > $file #grep -v '^\[C\]' "$file" > $tmp - #echo -e '\n'"[C] $value" >> $tmp + #echo -e '\n'"[C] $value" >> $tmp #./scripts/Create-DescPatch $item | patch -p1 fi done diff --git a/lib/misc/ccat.c b/lib/misc/ccat.c index 32192c2..0b783ee 100644 --- a/lib/misc/ccat.c +++ b/lib/misc/ccat.c @@ -2,14 +2,14 @@ * * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/ccat.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -22,7 +22,7 @@ #include #include #include - + int main(int argc) { char s1[]="................................" "................................"; diff --git a/lib/misc/cdromchk.c b/lib/misc/cdromchk.c index 541965e..7cb2a01 100644 --- a/lib/misc/cdromchk.c +++ b/lib/misc/cdromchk.c @@ -2,14 +2,14 @@ * * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/cdromchk.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -31,26 +31,26 @@ int main(int argc, char ** argv) { char buf2[4096]; int rc1,rc2,rc3; int c1=0,c2=0; - + if (argc != 3) { fprintf(stderr,"Usage: %s \n",argv[0]); return 1; } - + fprintf(stderr,"Checking CD-ROM ..."); - + if ( (cdrom=open(argv[1],O_RDONLY|O_SYNC)) == 0 ) { fprintf(stderr,"\n%s: Can't open %s: %s\n", argv[0],argv[1],strerror(errno)); return 1; } - + if ( (file=open(argv[2],O_RDONLY)) == 0 ) { fprintf(stderr,"\n%s: Can't open %s: %s\n", argv[0],argv[2],strerror(errno)); return 1; } - + while ( (rc1=read(file,buf1,4096)) > 0 ) { for (rc2=0; rc2 < rc1; rc2+=rc3) { rc3=read(cdrom,buf2+rc2,rc1-rc2); @@ -83,7 +83,7 @@ int main(int argc, char ** argv) { argv[0],strerror(errno)); return 1; } - + fprintf(stderr," OK (%d MB).\n",c2/1048576); return 0; } diff --git a/lib/misc/compare.sh b/lib/misc/compare.sh index 5f18dfc..72dfc0f 100755 --- a/lib/misc/compare.sh +++ b/lib/misc/compare.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/compare.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -40,7 +40,7 @@ function show_usage() { echo echo " -p: show patch to turn \$source into \$target" 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 " instead of -3 @@ -59,9 +59,9 @@ while [ $# -gt 0 ]; do targets="$3 $4" shift 3 ;; - -repository) + -repository) shift - repositories="$*"; set -- + repositories="$*"; set -- ;; *) if [ "$targets" ]; then packages="$*"; set -- @@ -73,13 +73,13 @@ while [ $# -gt 0 ]; do esac shift done - + function remove_header() { # thanks you blindcoder :) # local here=0 count=1 while read line ; do - count=$(( ${count} + 1 )) + count=$(( ${count} + 1 )) [ "${line//COPYRIGHT-NOTE-END/}" != "${line}" ] && here=${count} done < $1 tail -n +${here} $1 @@ -212,7 +212,7 @@ function compare_package() { missing=1 fi done - + tgtver="${tgtver#:}" tgtstatus="${tgtstatus#:}" tgtsize="${tgtsize#:}" @@ -234,13 +234,13 @@ function compare_package() { else version="$srcver -> $tgtver" fi - + if [ $equalstatus -eq 1 ]; then status="$srcstatus" else status="$srcstatus -> $tgtstatus" fi - + # acording to verbosity level, what info should i show? # if [ $verbose -eq 0 ]; then diff --git a/lib/misc/compare_builddirs.sh b/lib/misc/compare_builddirs.sh index 34fe3c7..9b97e3d 100755 --- a/lib/misc/compare_builddirs.sh +++ b/lib/misc/compare_builddirs.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/compare_builddirs.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2005 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -46,7 +46,7 @@ compare_builddirs() { fi [ -n "$cfg0" -a -n "$cfg1" ] || exit 1 - + # package list #diff -U1 "$cfg0/packages" "$cfg1/packages" diff --git a/lib/misc/copypackage.sh b/lib/misc/copypackage.sh index 78d7f79..56ed77d 100755 --- a/lib/misc/copypackage.sh +++ b/lib/misc/copypackage.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/copypackage.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -35,8 +35,8 @@ cppkg() { fi 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 - cp -v $from/var/adm/logs/*-$pkg.{err,out,log} $to/var/adm/logs/ 2> /dev/null else @@ -45,7 +45,7 @@ cppkg() { } 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 SDECFG_ID= diff --git a/lib/misc/cvsaddrm.sh b/lib/misc/cvsaddrm.sh index cad96e0..edba1cc 100644 --- a/lib/misc/cvsaddrm.sh +++ b/lib/misc/cvsaddrm.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/cvsaddrm.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/cvsmv.sh b/lib/misc/cvsmv.sh index 051be92..9688f28 100644 --- a/lib/misc/cvsmv.sh +++ b/lib/misc/cvsmv.sh @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/cvsmv.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/findorphans.sh b/lib/misc/findorphans.sh index f790584..9424f4e 100644 --- a/lib/misc/findorphans.sh +++ b/lib/misc/findorphans.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/findorphans.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -49,7 +49,7 @@ fi if [ ! -d "$root/var/adm/flists" ]; then echo "ERROR: '$root' is not a valid OpenSDE box/sandbox root" exit 3 -fi +fi flists=$( cd "$root"; echo var/adm/flists/* ) realroot=$( cd "$root"; pwd ) diff --git a/lib/misc/fixmaintainer.sh b/lib/misc/fixmaintainer.sh index ed73e03..e8c0f23 100644 --- a/lib/misc/fixmaintainer.sh +++ b/lib/misc/fixmaintainer.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/fixmaintainer.sh # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/getdefs.sh b/lib/misc/getdefs.sh index 082c881..377e56e 100644 --- a/lib/misc/getdefs.sh +++ b/lib/misc/getdefs.sh @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/getdefs.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/hello.c b/lib/misc/hello.c index 9f38501..d01a677 100644 --- a/lib/misc/hello.c +++ b/lib/misc/hello.c @@ -2,14 +2,14 @@ * * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/hello.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/hello.cc b/lib/misc/hello.cc index 666df2c..6e5d6f1 100644 --- a/lib/misc/hello.cc +++ b/lib/misc/hello.cc @@ -1,25 +1,25 @@ // Hello World in C++ (by Clifford - revisited for post C++ 8x by Rene Rebe) // // --- ROCK-COPYRIGHT-NOTE-BEGIN --- -// +// // This copyright note is auto-generated by ./scripts/Create-CopyPatch. // Please add additional copyright information _after_ the line containing // the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by // the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -// +// // ROCK Linux: rock-src/misc/archive/hello.cc // Copyright (C) 1998 - 2003 Clifford Wolf -// +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. A copy of the GNU General Public // License can be found at Documentation/COPYING. -// +// // Many people helped and are helping developing ROCK Linux. Please // have a look at http://www.rocklinux.org/ and the Documentation/TEAM // file for details. -// +// // --- ROCK-COPYRIGHT-NOTE-END --- #include diff --git a/lib/misc/hello.cs b/lib/misc/hello.cs index f385022..b66202d 100644 --- a/lib/misc/hello.cs +++ b/lib/misc/hello.cs @@ -3,9 +3,9 @@ // Run with the Mono Interpreter 'mint hello.exe' or // 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.)"); } diff --git a/lib/misc/hello.f b/lib/misc/hello.f index 2306812..f42203d 100644 --- a/lib/misc/hello.f +++ b/lib/misc/hello.f @@ -1,25 +1,25 @@ c Hello World in Fortran (by Clifford) c c --- ROCK-COPYRIGHT-NOTE-BEGIN --- -c +c c This copyright note is auto-generated by ./scripts/Create-CopyPatch. 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 ./scripts/Create-CopyPatch script. Do not edit this copyright text! -c +c c ROCK Linux: rock-src/misc/archive/hello.f c Copyright (C) 1998 - 2003 Clifford Wolf -c +c 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 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 License can be found at Documentation/COPYING. -c +c 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 file for details. -c +c c --- ROCK-COPYRIGHT-NOTE-END --- program hello_world diff --git a/lib/misc/hello.java b/lib/misc/hello.java index 58c4ee2..16b1ea4 100644 --- a/lib/misc/hello.java +++ b/lib/misc/hello.java @@ -2,25 +2,25 @@ // Compile with 'gcj --main=hello hello.java' // // --- ROCK-COPYRIGHT-NOTE-BEGIN --- -// +// // This copyright note is auto-generated by ./scripts/Create-CopyPatch. // Please add additional copyright information _after_ the line containing // the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by // the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -// +// // ROCK Linux: rock-src/misc/archive/hello.java // Copyright (C) 1998 - 2003 Clifford Wolf -// +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. A copy of the GNU General Public // License can be found at Documentation/COPYING. -// +// // Many people helped and are helping developing ROCK Linux. Please // have a look at http://www.rocklinux.org/ and the Documentation/TEAM // file for details. -// +// // --- ROCK-COPYRIGHT-NOTE-END --- public class hello { diff --git a/lib/misc/hunter.sh b/lib/misc/hunter.sh index 254d66a..857a883 100755 --- a/lib/misc/hunter.sh +++ b/lib/misc/hunter.sh @@ -1,12 +1,12 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/hunter.sh # Copyright (C) 2006 - 2008 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/iso2stick.sh b/lib/misc/iso2stick.sh index a4ae320..5b53aa4 100755 --- a/lib/misc/iso2stick.sh +++ b/lib/misc/iso2stick.sh @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/iso2stick.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -25,7 +25,7 @@ usage() fs="vfat -F 32" while [ "$1" ]; do - case "$1" in + case "$1" in -fs) fs="$2" ; shift ;; -*) usage ;; *) break ;; @@ -43,7 +43,7 @@ dev="$1" ; shift # # ceate fresh image # size=`du --block-size=1000000 $1 | cut -f 1` # size=$(( size + 20 )) # just to be sure -# +# # dd if=/dev/zero of=hd.img bs=1000000 count=$size # loop=`losetup -f` diff --git a/lib/misc/killport.sh b/lib/misc/killport.sh index 3b56192..70c3a0c 100644 --- a/lib/misc/killport.sh +++ b/lib/misc/killport.sh @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/killport.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/killtree.sh b/lib/misc/killtree.sh index bd14c3f..69ed016 100644 --- a/lib/misc/killtree.sh +++ b/lib/misc/killtree.sh @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/killtree.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/mini-makedevs.sh b/lib/misc/mini-makedevs.sh index badcd87..1560467 100644 --- a/lib/misc/mini-makedevs.sh +++ b/lib/misc/mini-makedevs.sh @@ -5,14 +5,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/mini-makedevs.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/mklibs.sh b/lib/misc/mklibs.sh index ad0741c..fc30caa 100644 --- a/lib/misc/mklibs.sh +++ b/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 # something like the following: # 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 # easy way out. @@ -358,7 +358,7 @@ add-to-queue-if-not-there () { if ! grep -q "^$qentry\$" "$qfile" ; then echo "$qentry" > "$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 done return 0 @@ -557,7 +557,7 @@ get-extra-flags () { exit 1 fi 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 fi if [ "x$1" = "xlibc-2.1.2.so" ] ; then @@ -827,7 +827,7 @@ do if [ -L "$lib" ] ; then $verbose -n 2>&1 L 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" else 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 ## not an error. -exit 0 +exit 0 diff --git a/lib/misc/regtest.sh b/lib/misc/regtest.sh index 29400ac..aa1202f 100755 --- a/lib/misc/regtest.sh +++ b/lib/misc/regtest.sh @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/regtest.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/reverse-log.pl b/lib/misc/reverse-log.pl index ac35a5f..998cae9 100644 --- a/lib/misc/reverse-log.pl +++ b/lib/misc/reverse-log.pl @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/reverse-log.pl # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/scrsav.c b/lib/misc/scrsav.c index b6c9466..f3f90f9 100644 --- a/lib/misc/scrsav.c +++ b/lib/misc/scrsav.c @@ -3,14 +3,14 @@ * * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/scrsav.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -67,12 +67,12 @@ int main(int argc, char ** argv) { if ( c/LINESIZE+1 != time(NULL) % LINES ) buffer[i] &= 0x0f; } - + fd=open(argv[2], O_WRONLY); if (fd < 0) { perror(argv[2]); return 1; } write(fd, miscdata, 4); write(fd, buffer, BUFSIZE); close(fd); - + return 0; } diff --git a/lib/misc/showdeps.sh b/lib/misc/showdeps.sh index 51733e3..482943f 100644 --- a/lib/misc/showdeps.sh +++ b/lib/misc/showdeps.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/showdeps.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/showsorteddeps.sh b/lib/misc/showsorteddeps.sh index 1356c98..0360acc 100644 --- a/lib/misc/showsorteddeps.sh +++ b/lib/misc/showsorteddeps.sh @@ -1,13 +1,13 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/showsorteddeps.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/split-patch.pl b/lib/misc/split-patch.pl index 699f65c..35a304d 100644 --- a/lib/misc/split-patch.pl +++ b/lib/misc/split-patch.pl @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/split-patch.pl # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/tcp-client.c b/lib/misc/tcp-client.c index ffebe78..121fb07 100644 --- a/lib/misc/tcp-client.c +++ b/lib/misc/tcp-client.c @@ -1,14 +1,14 @@ /* * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/tcp-client.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -36,15 +36,15 @@ int main(int argc, char ** argv) { char buf[BUFSIZE]; int sockfd,rc,c; fd_set rfds; - + if (argc != 3) { printf("Usage: %s \n",argv[0]); return 1; } - + if ( (sockfd=socket(AF_INET,SOCK_STREAM,0)) < 0 ) { perror("socket"); return 1; } - + bzero(&servaddr,sizeof(servaddr)); servaddr.sin_family = AF_INET; 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; } if ( connect(sockfd,&servaddr,sizeof(servaddr)) < 0 ) { perror("connect"); return 1; } - + if (ioctl(0,TCGETA, &tbuf) == -1) { perror("ioctl1"); return 1; } tbufsav=tbuf; tbuf.c_lflag &= ~(ICANON|ECHO); if (ioctl(0,TCSETAF, &tbuf) == -1) { perror("ioctl2"); return 1; } - + do { FD_ZERO(&rfds); FD_SET(sockfd,&rfds); FD_SET(0,&rfds); tv.tv_sec=1; tv.tv_usec=0; @@ -72,7 +72,7 @@ int main(int argc, char ** argv) { for (c=0; c 0); - + if (ioctl(0,TCSETAF, &tbufsav) == -1) { perror("ioctl3"); return 1; } return 0; } diff --git a/lib/misc/treenice.sh b/lib/misc/treenice.sh index 577ad3b..6b6b2aa 100644 --- a/lib/misc/treenice.sh +++ b/lib/misc/treenice.sh @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/misc/treenice.sh # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/misc/xctrld.c b/lib/misc/xctrld.c index 227e5f2..a31174c 100644 --- a/lib/misc/xctrld.c +++ b/lib/misc/xctrld.c @@ -3,14 +3,14 @@ * * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/xctrld.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define PORT 2225 @@ -50,16 +50,16 @@ void do_session(int netfd) { struct timeval tv; char buf[BUFSIZE]; fd_set rfds; - + snprintf(buf,BUFSIZE,"\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" "\nThis session has the PID %d. Have fun.\n\n",(int)getpid()); write(netfd,buf,strlen(buf)); - + pipe(p_in); pipe(p_out); if (signal(SIGCHLD,SIG_DFL) == SIG_ERR) xprf("signal: %s",strerror(errno)); - + if ( (pid=fork()) == 0 ) { close(0); dup2(p_in[0],0); close(1); dup2(p_out[1],1); @@ -71,9 +71,9 @@ void do_session(int netfd) { execl("/bin/sh","/bin/sh","--login","-i",NULL); xprf("execl: %s",strerror(errno)); exit(1); } - + close(p_in[0]); close(p_out[1]); - + while (waitpid(pid,NULL,WNOHANG) != pid) { FD_ZERO(&rfds); FD_SET(netfd,&rfds); FD_SET(p_out[0],&rfds); maxfd = netfd>p_out[0] ? netfd : p_out[0]; @@ -95,12 +95,12 @@ void do_session(int netfd) { int main(int argc, char ** argv) { struct sockaddr_in addr; int listenfd,fd; - + if (argc != 2 || argv[1][0] == '-') { fprintf(stderr,"Usage: %s < log-file | tty-device >\n",argv[0]); return 1; } - + if ( (out=fopen(argv[1],"a+")) == NULL ) { fprintf(stderr,"Can't open log file '%s': %s",argv[1],strerror(errno)); return 1; @@ -115,18 +115,18 @@ int main(int argc, char ** argv) { fprintf(out,"\n\n\r"); xprf("Binding port %d and waiting for connections ...\n",PORT); 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)); - + bzero(&addr,sizeof(addr)); addr.sin_family=AF_INET; addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_port = htons(PORT); if (bind(listenfd,&addr,sizeof(addr)) == -1) xprf("bind: %s",strerror(errno)); - + if (listen(listenfd,5)==-1) xprf("listen: %s",strerror(errno)); - + while (1) { if ((fd=accept(listenfd,NULL,NULL)) == -1) xprf("accept: %s",strerror(errno)); if (!fork()) { diff --git a/lib/misc/xline.c b/lib/misc/xline.c index 268f458..8a30040 100644 --- a/lib/misc/xline.c +++ b/lib/misc/xline.c @@ -1,14 +1,14 @@ /* * --- SDE-COPYRIGHT-NOTE-BEGIN --- * This copyright note is auto-generated by ./scripts/Create-CopyPatch. - * + * * Filename: lib/misc/xline.c * Copyright (C) 2008 The OpenSDE Project * Copyright (C) 2004 - 2006 The T2 SDE Project * Copyright (C) 1998 - 2003 Clifford Wolf - * + * * More information can be found in the files COPYING and README. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. A copy of the @@ -24,13 +24,13 @@ int main() { char ch,line[512]; time_t lasttm=0; int c=0; - + while ( read(0,&ch,1)==1 ) { line[c++]=ch; if (ch == '\n') if (lasttm500) c=500; diff --git a/lib/output/config-100.in b/lib/output/config-100.in index e6d3cf7..dbe5368 100644 --- a/lib/output/config-100.in +++ b/lib/output/config-100.in @@ -1,12 +1,12 @@ # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/output/config-100.in # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/output/parse-config b/lib/output/parse-config index a7b4279..4531a74 100644 --- a/lib/output/parse-config +++ b/lib/output/parse-config @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/output/parse-config # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/output/terminal b/lib/output/terminal index 8701ef8..6f7fb12 100644 --- a/lib/output/terminal +++ b/lib/output/terminal @@ -1,12 +1,12 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: misc/output/terminal # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/parse-config b/lib/parse-config index 9d2e040..d3f3037 100644 --- a/lib/parse-config +++ b/lib/parse-config @@ -1,14 +1,14 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/parse-config # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 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 ] then # 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 . 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 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 DISPLAY diff --git a/lib/sde-binary/package-gem.sh b/lib/sde-binary/package-gem.sh index 087280e..23bf348 100755 --- a/lib/sde-binary/package-gem.sh +++ b/lib/sde-binary/package-gem.sh @@ -1,12 +1,12 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-binary/package-gem.sh # Copyright (C) 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-binary/package.sh b/lib/sde-binary/package.sh index 394823b..6dfeaed 100755 --- a/lib/sde-binary/package.sh +++ b/lib/sde-binary/package.sh @@ -1,12 +1,12 @@ #!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-binary/package.sh # Copyright (C) 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-binary/preconfig.in b/lib/sde-binary/preconfig.in index cc4cc69..276d421 100644 --- a/lib/sde-binary/preconfig.in +++ b/lib/sde-binary/preconfig.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-binary/preconfig.in # Copyright (C) 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-build/config.cache b/lib/sde-build/config.cache index ee55881..238586c 100644 --- a/lib/sde-build/config.cache +++ b/lib/sde-build/config.cache @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-build/config.cache # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2005 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-cleanup/cleanup.sh b/lib/sde-cleanup/cleanup.sh index 5eda4fc..1e3b667 100644 --- a/lib/sde-cleanup/cleanup.sh +++ b/lib/sde-cleanup/cleanup.sh @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-cleanup/cleanup.sh # Copyright (C) 2006 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -36,7 +36,7 @@ cleanup_basic() { else type='file' fi - + if [ $delete -eq 1 ]; then echo_info "Removing '$node' ($type)". case "$type" in diff --git a/lib/sde-commit/commit-message.awk b/lib/sde-commit/commit-message.awk index 1e1dc40..a43e01f 100644 --- a/lib/sde-commit/commit-message.awk +++ b/lib/sde-commit/commit-message.awk @@ -1,12 +1,12 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-commit/commit-message.awk # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-config/config-games.hlp b/lib/sde-config/config-games.hlp index 6106f62..91c5867 100644 --- a/lib/sde-config/config-games.hlp +++ b/lib/sde-config/config-games.hlp @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/config-games.hlp # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-config/config-games.in b/lib/sde-config/config-games.in index 3d29318..9d6651b 100644 --- a/lib/sde-config/config-games.in +++ b/lib/sde-config/config-games.in @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/config-games.in # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-config/config-libs.hlp b/lib/sde-config/config-libs.hlp index cc919c4..53b9819 100644 --- a/lib/sde-config/config-libs.hlp +++ b/lib/sde-config/config-libs.hlp @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/config-libs.hlp # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-config/config-libs.in b/lib/sde-config/config-libs.in index 84937fa..ca1ab13 100644 --- a/lib/sde-config/config-libs.in +++ b/lib/sde-config/config-libs.in @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/config-libs.in # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-config/config.hlp b/lib/sde-config/config.hlp index 71e4f5c..eb6c08f 100644 --- a/lib/sde-config/config.hlp +++ b/lib/sde-config/config.hlp @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/config.hlp # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -30,9 +30,9 @@ COMMENT_LICENSE SDECFG_LICENSE_ISSUE The user of the T2-SDE is responsible for himself to verify 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. COMMENT_BUILD_SYS_CONF @@ -75,7 +75,7 @@ SDECFG_PARALLEL_MAX also be defined when you use distcc to perform distributed builds. 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 SDECFG_RETRY_BROKEN diff --git a/lib/sde-config/functions.in b/lib/sde-config/functions.in index dbe0d3d..8e3018e 100644 --- a/lib/sde-config/functions.in +++ b/lib/sde-config/functions.in @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/functions.in # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 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 our mailing list manager will send you." - + # Ok let us find a help for the current item ... # First of all mask all special chars in the item name @@ -570,7 +570,7 @@ $item_name:\\ s/^ // p }" lib/*/config*.hlp package/*/*/subconfig-*.hlp package/*/*/config*.hlp target/*/config*.hlp 2>/dev/null ) - + # Get help strings out of the temporary file. tmp_text=$(grep "^$item_name" $cfgtmpdir/config.help | cut -f2- -d' ' | sed -e "s,^',," -e "s,'$,," ) diff --git a/lib/sde-config/main.in b/lib/sde-config/main.in index 43a5b45..ba3abb2 100644 --- a/lib/sde-config/main.in +++ b/lib/sde-config/main.in @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/main.in # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -181,7 +181,7 @@ if test -f $cfgtmpdir/license-issue.ask; then comment ' ' fi - + bool 'I have read and understood the licensing issues.' SDECFG_LICENSE_ISSUE 0 block_end @@ -416,7 +416,7 @@ pkgfilter sed '/^[XO] --* / d;' SDECFG_ID="`echo $SDECFG_ID | sed 's,-noexpert.*,,'`" [ "$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" SDECFG_ID="$config-$SDECFG_ID" diff --git a/lib/sde-config/pkgsel2awk.sh b/lib/sde-config/pkgsel2awk.sh index 893f90d..01ed490 100755 --- a/lib/sde-config/pkgsel2awk.sh +++ b/lib/sde-config/pkgsel2awk.sh @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-config/pkgsel2awk.sh # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -21,7 +21,7 @@ # Example: # pkgsel X python # Result: ( / [^/]*\/python / ) { $1="X"; } -# pkgsel "O perl/*" +# pkgsel "O perl/*" # Result: ( / perl\/[^/]* / ) { $1="O"; } # pkgsel_parse < config/${config}/pkgsel # Result: creates pkgsel.awk output @@ -80,7 +80,7 @@ pkgsel_parse() { } cat <= len(self.contents): newChild.nextSibling = None - + parent = self parentsNextSibling = None while not parentsNextSibling: @@ -180,8 +180,8 @@ class PageElement: else: newChildsLastElement.next = None else: - nextChild = self.contents[position] - newChild.nextSibling = nextChild + nextChild = self.contents[position] + newChild.nextSibling = nextChild if newChild.nextSibling: newChild.nextSibling.previousSibling = newChild newChildsLastElement.next = nextChild @@ -269,7 +269,7 @@ class PageElement: if l: r = l[0] return r - + def _findAll(self, name, attrs, text, limit, generator, **kwargs): "Iterates over a generator looking for things that match." @@ -294,7 +294,7 @@ class PageElement: return results #These Generators can be used to navigate starting from both - #NavigableStrings and Tags. + #NavigableStrings and Tags. def nextGenerator(self): i = self while i: @@ -328,7 +328,7 @@ class PageElement: # Utility methods def substituteEncoding(self, str, encoding=None): encoding = encoding or "utf-8" - return str.replace("%SOUP-ENCODING%", encoding) + return str.replace("%SOUP-ENCODING%", encoding) def toEncoding(self, s, encoding=None): """Encodes an object to a string in some encoding, or to Unicode. @@ -367,7 +367,7 @@ class NavigableString(unicode, PageElement): return self.encode(encoding) else: return self - + class CData(NavigableString): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): @@ -382,11 +382,11 @@ class ProcessingInstruction(NavigableString): class Comment(NavigableString): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): - return "" % NavigableString.__str__(self, encoding) + return "" % NavigableString.__str__(self, encoding) class Declaration(NavigableString): def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING): - return "" % NavigableString.__str__(self, encoding) + return "" % NavigableString.__str__(self, encoding) class Tag(PageElement): @@ -419,7 +419,7 @@ class Tag(PageElement): """Returns the value of the 'key' attribute for the tag, or the value given for 'default' if it doesn't have that attribute.""" - return self._getAttrMap().get(key, default) + return self._getAttrMap().get(key, default) def has_key(self, 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." return True - def __setitem__(self, key, value): + def __setitem__(self, key, value): """Setting tag[key] sets the value of the 'key' attribute for the tag.""" self._getAttrMap() @@ -522,7 +522,7 @@ class Tag(PageElement): if self.attrs: for key, val in self.attrs: fmt = '%s="%s"' - if isString(val): + if isString(val): if self.containsSubstitutions and '%SOUP-ENCODING%' in val: val = self.substituteEncoding(val, encoding) @@ -555,7 +555,7 @@ class Tag(PageElement): val = re.sub("([<>]|&(?![^\s]+;))", lambda x: "&" + self.XML_SPECIAL_CHARS_TO_ENTITIES[x.group(0)[0]] + ";", val) - + attrs.append(fmt % (self.toEncoding(key, encoding), self.toEncoding(val, encoding))) close = '' @@ -577,7 +577,7 @@ class Tag(PageElement): s = [] attributeString = '' if attrs: - attributeString = ' ' + ' '.join(attrs) + attributeString = ' ' + ' '.join(attrs) if prettyPrint: s.append(space) s.append('<%s%s%s>' % (encodedName, attributeString, close)) @@ -609,14 +609,14 @@ class Tag(PageElement): elif isinstance(c, Tag): s.append(c.__str__(encoding, prettyPrint, indentLevel)) if text and prettyPrint: - text = text.strip() + text = text.strip() if text: if prettyPrint: s.append(" " * (indentLevel-1)) s.append(text) if prettyPrint: s.append("\n") - return ''.join(s) + return ''.join(s) #Soup methods @@ -651,13 +651,13 @@ class Tag(PageElement): # Pre-3.x compatibility methods first = find fetch = findAll - + def fetchText(self, text=None, recursive=True, limit=None): return self.findAll(text=text, recursive=recursive, limit=limit) def firstText(self, text=None, recursive=True): return self.find(text=text, recursive=recursive) - + #Utility methods def append(self, tag): @@ -672,7 +672,7 @@ class Tag(PageElement): if not getattr(self, 'attrMap'): self.attrMap = {} for (key, value) in self.attrs: - self.attrMap[key] = value + self.attrMap[key] = value return self.attrMap #Generator methods @@ -680,12 +680,12 @@ class Tag(PageElement): for i in range(0, len(self.contents)): yield self.contents[i] raise StopIteration - + def recursiveChildGenerator(self): stack = [(self, 0)] while stack: tag, start = stack.pop() - if isinstance(tag, Tag): + if isinstance(tag, Tag): for i in range(start, len(tag.contents)): a = tag.contents[i] yield a @@ -720,7 +720,7 @@ class SoupStrainer: return self.text else: return "%s|%s" % (self.name, self.attrs) - + def searchTag(self, markupName=None, markupAttrs={}): found = None markup = None @@ -737,7 +737,7 @@ class SoupStrainer: if callFunctionWithTagData: match = self.name(markupName, markupAttrs) else: - match = True + match = True markupAttrMap = None for attr, matchAgainst in self.attrs.items(): if not markupAttrMap: @@ -762,7 +762,7 @@ class SoupStrainer: #print 'looking for %s in %s' % (self, markup) found = None # If given a list of items, scan it for a text element that - # matches. + # matches. if isList(markup) and not isinstance(markup, Tag): for element in markup: if isinstance(element, NavigableString) \ @@ -783,8 +783,8 @@ class SoupStrainer: raise Exception, "I don't know how to match against a %s" \ % markup.__class__ return found - - def _matches(self, markup, matchAgainst): + + def _matches(self, markup, matchAgainst): #print "Matching %s against %s" % (markup, matchAgainst) result = False 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 to determine whether or not something is stringlike.""" try: - return isinstance(s, unicode) or isintance(s, basestring) + return isinstance(s, unicode) or isintance(s, basestring) except NameError: return isinstance(s, str) @@ -865,7 +865,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): """This class contains the basic parser and search code. It defines a parser that knows nothing about tag behavior except for the following: - + You can't close a tag without closing all the tags it encloses. That is, "" actually means "". @@ -880,7 +880,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): XML_ENTITY_LIST = {} for i in Tag.XML_SPECIAL_CHARS_TO_ENTITIES.values(): - XML_ENTITY_LIST[i] = True + XML_ENTITY_LIST[i] = True SELF_CLOSING_TAGS = {} NESTABLE_TAGS = {} @@ -903,7 +903,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): convertEntities=None, selfClosingTags=None): """The Soup object is initialized as the 'root tag', and the 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 class has some tricks for dealing with some HTML that kills @@ -937,7 +937,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): self.smartQuotesTo = None self.instanceSelfClosingTags = buildTagMap(None, selfClosingTags) SGMLParser.__init__(self) - + if hasattr(markup, 'read'): # It's a file-type object. markup = markup.read() self.markup = markup @@ -947,7 +947,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): except StopParsing: pass self.markup = None # The markup can now be GCed - + def _feed(self, inDocumentEncoding=None): # Convert the document to Unicode. markup = self.markup @@ -963,7 +963,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): if markup: if self.markupMassage: if not isList(self.markupMassage): - self.markupMassage = self.MARKUP_MASSAGE + self.markupMassage = self.MARKUP_MASSAGE for fix, m in self.markupMassage: markup = fix.sub(m, markup) self.reset() @@ -992,7 +992,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): self-closing tag according to this parser.""" return self.SELF_CLOSING_TAGS.has_key(name) \ or self.instanceSelfClosingTags.has_key(name) - + def reset(self): Tag.__init__(self, self, self.ROOT_TAG_NAME) self.hidden = 1 @@ -1002,7 +1002,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): self.tagStack = [] self.quoteStack = [] self.pushTag(self) - + def popTag(self): tag = self.tagStack.pop() # Tags with just one string-owning child get the child as a @@ -1052,7 +1052,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): the given tag.""" #print "Popping to %s" % name if name == self.ROOT_TAG_NAME: - return + return numPops = 0 mostRecentTag = None @@ -1065,7 +1065,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): for i in range(0, numPops): mostRecentTag = self.popTag() - return mostRecentTag + return mostRecentTag def _smartPop(self, name): @@ -1102,7 +1102,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): and p.name in nestingResetTriggers) \ or (nestingResetTriggers == None and isResetNesting and self.RESET_NESTING_TAGS.has_key(p.name)): - + #If we encounter one of the nesting reset triggers #peculiar to this tag, or we encounter another tag #that causes nesting to reset, pop up to but not @@ -1121,7 +1121,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): #print "<%s> is not real!" % name attrs = ''.join(map(lambda(x, y): ' %s="%s"' % (x, y), attrs)) self.handle_data('<%s%s>' % (name, attrs)) - return + return self.endData() if not self.isSelfClosingTag(name) and not selfClosing: @@ -1137,7 +1137,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): self.previous = tag self.pushTag(tag) if selfClosing or self.isSelfClosingTag(name): - self.popTag() + self.popTag() if name in self.QUOTE_TAGS: #print "Beginning quote (%s)" % name self.quoteStack.append(name) @@ -1203,7 +1203,7 @@ class BeautifulStoneSoup(Tag, SGMLParser): if not data: data = '&%s;' % ref self.handle_data(data) - + def handle_decl(self, data): "Handle DOCTYPEs and the like as Declaration objects." self._toStringSubclass(data, Declaration) @@ -1286,7 +1286,7 @@ class BeautifulSoup(BeautifulStoneSoup): 'spacer', 'link', 'frame', 'base']) QUOTE_TAGS = {'script': None} - + #According to the HTML standard, each of these inline tags can #contain another tag of the same type. Furthermore, it's common #to actually use these tags this way. @@ -1298,7 +1298,7 @@ class BeautifulSoup(BeautifulStoneSoup): #to actually use these tags this way. 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' : [], 'ul' : [], 'li' : ['ul', 'ol'], @@ -1306,8 +1306,8 @@ class BeautifulSoup(BeautifulStoneSoup): 'dd' : ['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'], 'td' : ['tr'], 'th' : ['tr'], @@ -1377,7 +1377,7 @@ class BeautifulSoup(BeautifulStoneSoup): class StopParsing(Exception): pass - + class ICantBelieveItsBeautifulSoup(BeautifulSoup): """The BeautifulSoup class is oriented towards skipping over @@ -1423,7 +1423,7 @@ class MinimalSoup(BeautifulSoup): This also makes it better for subclassing than BeautifulStoneSoup or BeautifulSoup.""" - + RESET_NESTING_TAGS = buildTagMap('noscript') NESTABLE_TAGS = {} @@ -1453,7 +1453,7 @@ class BeautifulSOAP(BeautifulStoneSoup): parent = self.tagStack[-2] parent._getAttrMap() 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)): parent[tag.name] = tag.contents[0] BeautifulStoneSoup.popTag(self) @@ -1530,9 +1530,9 @@ class UnicodeDammit: self.triedEncodings = [] if markup == '' or isinstance(markup, unicode): self.originalEncoding = None - self.unicode = unicode(markup) + self.unicode = unicode(markup) return - + u = None for proposedEncoding in overrideEncodings: u = self._convertFrom(proposedEncoding) @@ -1541,7 +1541,7 @@ class UnicodeDammit: for proposedEncoding in (documentEncoding, sniffedEncoding): u = self._convertFrom(proposedEncoding) if u: break - + # If no luck and we have auto-detection library, try that: if not u and chardet and not isinstance(self.markup, unicode): u = self._convertFrom(chardet.detect(self.markup)['encoding']) @@ -1563,9 +1563,9 @@ class UnicodeDammit: sub = '&#x%s;' % sub[1] else: sub = '&%s;' % sub[0] - return sub + return sub - def _convertFrom(self, proposed): + def _convertFrom(self, proposed): proposed = self.find_codec(proposed) if not proposed or proposed in self.triedEncodings: return None @@ -1584,12 +1584,12 @@ class UnicodeDammit: try: # print "Trying to convert document to %s" % proposed u = self._toUnicode(markup, proposed) - self.markup = u + self.markup = u self.originalEncoding = proposed except Exception, e: # print "That didn't work!" # print e - return None + return None #print "Correct encoding: %s" % proposed return self.markup @@ -1617,7 +1617,7 @@ class UnicodeDammit: data = data[4:] newdata = unicode(data, encoding) return newdata - + def _detectEncoding(self, xml_data): """Given a document, tries to detect its XML encoding.""" xml_encoding = sniffed_xml_encoding = None @@ -1689,7 +1689,7 @@ class UnicodeDammit: or charset def _codec(self, charset): - if not charset: return charset + if not charset: return charset codec = None try: codecs.lookup(charset) diff --git a/lib/sde-package/info.py b/lib/sde-package/info.py index 0dd901d..a2352ed 100644 --- a/lib/sde-package/info.py +++ b/lib/sde-package/info.py @@ -1,7 +1,7 @@ import time base="http://packages.debian.org" 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 Run --help (-h) for more info""" force=True @@ -9,18 +9,18 @@ guess=True def copynote(package): return """[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] +[COPY] [COPY] Filename: package/.../%(p)s/%(p)s.desc [COPY] Copyright (C) %(t)s The OpenSDE Project -[COPY] +[COPY] [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] 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] GNU General Public License can be found in the file COPYING. [COPY] --- SDE-COPYRIGHT-NOTE-END ---""" %{ "p": package, -'t': time.strftime('%Y')} +'t': time.strftime('%Y')} desci="[I] TODO: Short Information" desct="""TODO: Long Explanation TODO: Long Explanation @@ -78,7 +78,7 @@ categories={"admin":"extra/tool", "web":"extra/network", "x11":"extra/x11" } - # category exlucsion:reason + # category exlucsion:reason debianpolicy="http://www.debian.org/doc/debian-policy/ch-binary" excludecat={"virtual":""" This is a debian only package. diff --git a/lib/sde-package/new-debian.py b/lib/sde-package/new-debian.py index 284da3b..00bea33 100644 --- a/lib/sde-package/new-debian.py +++ b/lib/sde-package/new-debian.py @@ -10,26 +10,26 @@ class cParseHTML(HTMLParser): def parse(self,string): self.val=string self.feed(self.val) - return self.val + return self.val cParse=cParseHTML() -parse=cParse.parse +parse=cParse.parse repo=None pkg=None bdescd=False parser = optparse.OptionParser(usage) 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""") 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. """) parser.add_option("-f", "--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.""") parser.add_option("-g", "--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.""") parser.add_option("-o", "--outpkg",dest="outpkg", help="""Write desc to package.""") @@ -67,11 +67,11 @@ elif len(opts)==2: else: parse.error("Invalid options.") 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 try: page=urllib2.urlopen(url).read() -except: +except: print "Error: package '%s' does not exist." % sys.argv[nargs] sys.exit() soup = BeautifulSoup(page) @@ -91,7 +91,7 @@ except: pass try: desci="[I] " + parse("".join(soup("h2")[0])).capitalize()+"." except: pass -try: +try: desct=parse(str(soup("p")[1])) except: pass lcat=soup("span") @@ -114,7 +114,7 @@ if guess: try: license=licenses[lcat] descl="[L] " + license - except:pass + except:pass sdesct="" cnt=0 cnt2=0 @@ -150,14 +150,14 @@ formatteddesc="""%(copy)s %(d)s """%{ "copy": copy,"i": desci,"t":sdesct,"u":descu,"a":desca, "m":descm,"c":descc,"l":descl,"s":descs,"v":descv,"p":descp, -"d":descd} +"d":descd} if options.outpkg: output=options.outpkg.split("/") optcnt=len(output) - output.count("") out="" 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" dir="package/wip/" +output[0] if os.path.isdir(dir): @@ -178,18 +178,18 @@ if options.outpkg: if os.path.isfile(out): print "failed\n package %(p)s belongs to %(c)s!" %{"p":output[1], "c":output[0]} - sys.exit(1) + sys.exit(1) else: os.mkdir(dir) else:parser.error("Inavlid Option for --outpkg (-o)") try: os.system("echo -n 'Writing desc to file...'") outf=open(out,"w") - outf.write(formatteddesc) + outf.write(formatteddesc) outf.close() os.system("echo 'ok'") except: - print"Error writing to file " + out + print"Error writing to file " + out if bdescd: os.system("echo -n 'Patching cksum...'") if os.popen("sde pkg up " + output[len(output)-1]+"&>/dev/null"): diff --git a/lib/sde-package/new-freshmeat.sh b/lib/sde-package/new-freshmeat.sh index 5df8703..c26b76a 100644 --- a/lib/sde-package/new-freshmeat.sh +++ b/lib/sde-package/new-freshmeat.sh @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/new-freshmeat.sh # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -63,7 +63,7 @@ read_fm_config() { extract_xml_name url_cvs $fmname.xml url_cvs url="$(curl -I $urlh 2>/dev/null | grep "^Location:" | sed -e 's,^Location: \(.*\)$,\1,' | tr -d '\015' )" - get_download $url_tbz $url_tgz $url_zip #@FIXME $url_cvs + get_download $url_tbz $url_tgz $url_zip #@FIXME $url_cvs # grep trove categories for status IDs for trove_id in `grep '' $fmname.xml | sed 's,.*\(.*\),\1,g'` ; do @@ -99,11 +99,11 @@ read_fm_config() { echo -n "$dev_mail" >dev_mail # for some strange reason, this doesn't work: -# cat subst | while read from to ; do +# cat subst | while read from to ; do # export dev_mail="${dev_mail// $from /$to}" # done # dev_mail will have the same value as before - cat subst | while read from to ; do + cat subst | while read from to ; do dev_mail="`cat dev_mail`" dev_mail="${dev_mail// $from /$to}" echo -n "$dev_mail" >dev_mail @@ -215,12 +215,12 @@ note=SDE-COPYRIGHT-NOTE cat > $package.desc <>$package.conf <<-EOF -${package}_main() { +${package}_main() { : TODO } diff --git a/lib/sde-package/new.in b/lib/sde-package/new.in index 27a22e9..62ded85 100644 --- a/lib/sde-package/new.in +++ b/lib/sde-package/new.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/new.in # Copyright (C) 2006 - 2008 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -70,7 +70,7 @@ package_new() { *) /bin/sh ./lib/sde-package/new.sh ${new_repository#$SDEROOT/package/}/$new_package "$@" ;; esac - if [ -e package/*/$new_package/$new_package.desc ];then + if [ -e package/*/$new_package/$new_package.desc ];then echo -n "Updating chksum $new_package... " if ./bin/sde pkg up $new_package &> /dev/null;then echo "ok" diff --git a/lib/sde-package/new.sh b/lib/sde-package/new.sh index 5b208cf..5d3d0ee 100644 --- a/lib/sde-package/new.sh +++ b/lib/sde-package/new.sh @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/new.sh # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -83,12 +83,12 @@ TAG=SDE-COPYRIGHT-NOTE cat >$confdir/$package.desc <>$confdir/$package.conf <<-EEE -${package}_main() { +${package}_main() { : TODO } diff --git a/lib/sde-package/package-list.awk b/lib/sde-package/package-list.awk index 8216c64..f8380c6 100644 --- a/lib/sde-package/package-list.awk +++ b/lib/sde-package/package-list.awk @@ -1,13 +1,13 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/package-list.awk # Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-package/package-update.awk b/lib/sde-package/package-update.awk index 936c4e7..df7ba62 100644 --- a/lib/sde-package/package-update.awk +++ b/lib/sde-package/package-update.awk @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/package-update.awk # Copyright (C) 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-package/patch-cksum.sh b/lib/sde-package/patch-cksum.sh index 2105479..84fdb9f 100755 --- a/lib/sde-package/patch-cksum.sh +++ b/lib/sde-package/patch-cksum.sh @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-package/patch-cksum.sh # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -27,7 +27,7 @@ usage() echo "./scripts/Create-CkSumPatch [options] " echo " " echo "Options:" - echo " -override Create new cksum if old one should be valid." + echo " -override Create new cksum if old one should be valid." echo " -help This." } @@ -51,7 +51,7 @@ cksum_file() { sedscript='s,^[0-9]* *$file,$newcksum $file,' ;; *.desc) - has_D='fgrep "[D]" | sed "s/[[]D[^ ]*//"' + has_D='fgrep "[D]" | sed "s/[[]D[^ ]*//"' sedscript='s,\[D\] *[0-9]* *$file,[D] $newcksum $file,' ;; *) diff --git a/lib/sde-package/patch-copyright.sh b/lib/sde-package/patch-copyright.sh index 9b75dc3..f14f6ff 100755 --- a/lib/sde-package/patch-copyright.sh +++ b/lib/sde-package/patch-copyright.sh @@ -73,7 +73,7 @@ else echo "Cannot find '$i', ignoring." 1>&2 fi done - set -- $files + set -- $files [ $# = 0 ] && exit fi diff --git a/lib/sde-wrapper-command.in b/lib/sde-wrapper-command.in index cb9b677..298cf83 100644 --- a/lib/sde-wrapper-command.in +++ b/lib/sde-wrapper-command.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-wrapper-command.in # Copyright (C) 2006 - 2008 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-wrapper-discriminator.in b/lib/sde-wrapper-discriminator.in index b5ff24e..84a737d 100644 --- a/lib/sde-wrapper-discriminator.in +++ b/lib/sde-wrapper-discriminator.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-wrapper-discriminator.in # Copyright (C) 2008 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/sde-wrapper.in b/lib/sde-wrapper.in index f7b0cb8..c8354ba 100644 --- a/lib/sde-wrapper.in +++ b/lib/sde-wrapper.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/sde-wrapper.in # Copyright (C) 2008 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/lib/statistics/catinfo b/lib/statistics/catinfo index 6fec4b9..2c1943b 100755 --- a/lib/statistics/catinfo +++ b/lib/statistics/catinfo @@ -6,7 +6,7 @@ echo Total number of packages: $pkgs echo "" for category in $categories; do - # Determine the number of packages containing + # Determine the number of packages containing # the current categories. categoryOwners=$(grep -e "^\[C[^O].*$category" package/*/*/*.desc | wc -l) diff --git a/lib/statistics/flaginfo b/lib/statistics/flaginfo index a2dc8bd..3f8c8e5 100755 --- a/lib/statistics/flaginfo +++ b/lib/statistics/flaginfo @@ -6,7 +6,7 @@ echo Total number of packages: $pkgs echo "" for flag in $flags; do - # Determine the number of packages containing + # Determine the number of packages containing # the current flag. flagOwners=$(grep -e "^\[F.*$flag" package/*/*/*.desc | wc -l) diff --git a/lib/statistics/licenseinfo b/lib/statistics/licenseinfo index 2734337..f9d66f7 100755 --- a/lib/statistics/licenseinfo +++ b/lib/statistics/licenseinfo @@ -6,7 +6,7 @@ echo Total number of packages: $pkgs echo "" for lic in $licenses; do - # Determine the number of packages containing + # Determine the number of packages containing # the current license. licOwners=$(grep -e "^\[L.*$lic" package/*/*/*.desc | wc -l) diff --git a/lib/statistics/statusinfo b/lib/statistics/statusinfo index 7182f3e..ad826f4 100755 --- a/lib/statistics/statusinfo +++ b/lib/statistics/statusinfo @@ -6,7 +6,7 @@ echo Total number of packages: $pkgs echo "" for status in $statuses; do - # Determine the number of packages containing + # Determine the number of packages containing # the current status. statusOwners=$(grep -e "^\[S[^R].*$status" package/*/*/*.desc | wc -l) diff --git a/lib/term-functions.in b/lib/term-functions.in index babe251..d04b2c4 100644 --- a/lib/term-functions.in +++ b/lib/term-functions.in @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: lib/term-functions.in # Copyright (C) 2006 - 2007 The OpenSDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -31,8 +31,8 @@ COLOR_NORMAL='\033[0m' COLOR_INFO='\033[32;1m' COLOR_TITLE='\033[35m' COLOR_MESSAGE='\033[36m' -COLOR_SUCESS='\033[32m' -COLOR_WARNING='\033[33;1m' +COLOR_SUCESS='\033[32m' +COLOR_WARNING='\033[33;1m' COLOR_FAILURE='\033[31m' # CLI fanciness @@ -47,7 +47,7 @@ echo_info() { echo -e "${COLOR_INFO}->${COLOR_NORMAL} $*" >&2 else while read text; do - echo -e "${COLOR_INFO}->${COLOR_NORMAL} $text" + echo -e "${COLOR_INFO}->${COLOR_NORMAL} $text" done >&2 fi fi diff --git a/lib/vserver/install b/lib/vserver/install index 2d7595e..8b7c89f 100755 --- a/lib/vserver/install +++ b/lib/vserver/install @@ -1,13 +1,13 @@ #!/bin/bash # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: misc/vserver/install # Copyright (C) 2006 Juergen "George" Sawinski # Copyright (C) 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -69,7 +69,7 @@ Options: Miscellaneous: -v Increase verbosity level -pkgdir Package directory - -admdir Set alternate /var/adm directory + -admdir Set alternate /var/adm directory (a link into the install root is created) EOF } @@ -93,7 +93,7 @@ while [ "$1" ]; do -admdir) admdir=$2 ; shift ;; -*) usage ; exit ;; - + *) pkgs="$pkgs $1" ;; esac shift @@ -125,9 +125,9 @@ parse_template() { dbg 2 " Parsing template \`$1'" - while read line; do + while read line; do if [[ $line = .include* ]]; then - parse_template ${line/.include/} + parse_template ${line/.include/} else echo $line fi diff --git a/scripts/Build-Job b/scripts/Build-Job index 897167c..a74caf0 100755 --- a/scripts/Build-Job +++ b/scripts/Build-Job @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Build-Job # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 133a99d..568e6f0 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Build-Pkg # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -89,7 +89,7 @@ while [ "$1" ] ; do done # check if arguments are left as package names -if [ $# = 0 ] ; then +if [ $# = 0 ] ; then help_msg ; exit 1 fi @@ -129,7 +129,7 @@ if [ -z "$id" ] ; then fi # more than one package is passed -if [ $# -gt 1 ] ; then +if [ $# -gt 1 ] ; then for x ; do if ! ./scripts/Build-Pkg $options $x && \ [ $stagelevel -le "$SDECFG_ABORT_ON_ERROR_AFTER" ] ; then @@ -156,10 +156,10 @@ if [ "$chroot" = 1 ] ; then x_mknod dev/zero c 1 5 x_mknod dev/random c 1 8 x_mknod dev/urandom c 1 9 - x_mknod dev/loop/0 b 7 0 - x_mknod dev/loop/1 b 7 1 - x_mknod dev/loop/2 b 7 2 - x_mknod dev/loop/3 b 7 3 + x_mknod dev/loop/0 b 7 0 + x_mknod dev/loop/1 b 7 1 + x_mknod dev/loop/2 b 7 2 + x_mknod dev/loop/3 b 7 3 #_mknod dev/tty c 5 0 if [ ! -L dev/fd ]; then @@ -652,19 +652,19 @@ abort() { sleep 1 ; kill -INT $strace_pid ; sleep 1 fl_stparse -w $builddir/fl_wrapper.wlog \ -r $builddir/fl_wrapper.rlog < $builddir/strace.out - + fi - + # sanitize accidental //s sed -i -e 's,//*,/,g' $builddir/fl_wrapper.wlog sed -i -e 's,//*,/,g' $builddir/fl_wrapper.rlog - + if [ "$SDECFG_FLIST" = "flwrapper" -o \ "$SDECFG_FLIST" = "strace" ] ; then if [ "$toolsdir" = "tools.cross" ]; then xbase="$( cd $xroot/ 2> /dev/null ; pwd -P )" flistvalid="$xbase|$flistvalid" - + if egrep -qv " ($flistvalid)/" $builddir/fl_wrapper.wlog then while read file ; do @@ -787,7 +787,7 @@ abort() { # TODO: goups are not used yet (and it is not easy here) del_pattern= for x in `echo "$desc_E" | egrep '^del ' | sed 's/^del //' ` ; do - del_pattern="$del_pattern -e \".*: $x\$\"" + del_pattern="$del_pattern -e \".*: $x\$\"" done if [ -n "$del_pattern" ] ; then echo "Deleting dependencies, pattern: $del_pattern ..." @@ -912,7 +912,7 @@ EOT fi desc="No description found!" for ((x=0; x 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 if [ "$daemon_mode" = 1 ] ; then @@ -153,9 +153,9 @@ pkgloop() { for file in $( ls $dir 2> /dev/null ) ; do if [ $SDECFG_PKGFILE_VER = 1 ] ; then x="$file-" - else + else x="$file" - fi + fi if ! grep -q "$x" $pkglst ; then echo_error "$dir/$file should not be present (now in tmp/invalid-files.lst)!" mkdir -p tmp; echo "$dir/$file" >> tmp/invalid-files.lst diff --git a/scripts/Build-Tools b/scripts/Build-Tools index d054ca6..bf9d6b4 100755 --- a/scripts/Build-Tools +++ b/scripts/Build-Tools @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Build-Tools # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -293,7 +293,7 @@ EOT > build/$SDECFG_ID/TOOLCHAIN/$toolsdir/lib/parse-config.$$ mv build/$SDECFG_ID/TOOLCHAIN/$toolsdir/lib/parse-config.$$ \ build/$SDECFG_ID/TOOLCHAIN/$toolsdir/lib/parse-config - + bin/find \ architecture/$arch/. package/. $( get_reverted `get_expanded target/%/. $targetchain` ) -type f \ -name 'parse-config-fixarch' \ diff --git a/scripts/Check-Deps-1 b/scripts/Check-Deps-1 index 2ff6702..4343d6f 100755 --- a/scripts/Check-Deps-1 +++ b/scripts/Check-Deps-1 @@ -1,14 +1,14 @@ #!/usr/bin/gawk -f # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Check-Deps-1 # Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Check-PkgFormat b/scripts/Check-PkgFormat index 2473b55..8977a9d 100755 --- a/scripts/Check-PkgFormat +++ b/scripts/Check-PkgFormat @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Check-PkgFormat # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Check-PkgVersion b/scripts/Check-PkgVersion index 1bdadaa..05804c9 100755 --- a/scripts/Check-PkgVersion +++ b/scripts/Check-PkgVersion @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Check-PkgVersion # Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Config b/scripts/Config index e7116e9..900ed8a 100755 --- a/scripts/Config +++ b/scripts/Config @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Config # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -162,7 +162,7 @@ configtitle="$(printf ' %-50s %6s active packages ]' \ bprof main stop # NOTE: ROCKCFG -> SDECFG automatized convertion -grep -q 'ROCKCFG' $cfgtmpdir/config/config && +grep -q 'ROCKCFG' $cfgtmpdir/config/config && sed -i -e 's,ROCKCFG,SDECFG,g' $cfgtmpdir/config/config . $cfgtmpdir/config/config diff --git a/scripts/Create-AutoPatch b/scripts/Create-AutoPatch index a40da26..3b38348 100755 --- a/scripts/Create-AutoPatch +++ b/scripts/Create-AutoPatch @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/Create-AutoPatch # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Create-DescPatch b/scripts/Create-DescPatch index 594eebf..fd28179 100755 --- a/scripts/Create-DescPatch +++ b/scripts/Create-DescPatch @@ -2,14 +2,14 @@ # # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-DescPatch # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Create-Diff b/scripts/Create-Diff index 90ab083..ba72c23 100755 --- a/scripts/Create-Diff +++ b/scripts/Create-Diff @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-Diff # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -67,7 +67,7 @@ for x in $directories ; do $_= if $fn =~ /~$/' done | perl -w `dirname $0`/patch-pp.pl "$newdir" >> /tmp/$$ -if [ "$editor" = "" ]; then +if [ "$editor" = "" ]; then cat /tmp/$$ rm /tmp/$$ else diff --git a/scripts/Create-ErrList b/scripts/Create-ErrList index 015ec13..1bdcc65 100755 --- a/scripts/Create-ErrList +++ b/scripts/Create-ErrList @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-ErrList # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -124,7 +124,7 @@ if [ "$newdelete" = 1 ]; then cksum2=$( pkgchksum package/*/$pkg/ ) if [ "$cksum1" != "$cksum2" ]; then echo "Scheduling package '$pkg' for rebuild ..." - if [ ! "$dryrun" = "1" ]; then + if [ ! "$dryrun" = "1" ]; then mine -rf -R build/$SDECFG_ID $pkg rm -f build/$SDECFG_ID/var/adm/*/?-$pkg.* fi @@ -171,7 +171,7 @@ if [ "$1" ] ; then rm -vf "$logdir"/../*/$x done elif [ "$remove" = 1 ] ; then - for x ; do + for x ; do echo "Scheduling package '$x' for rebuild ..." mine -rf -R build/$SDECFG_ID $x rm -f build/$SDECFG_ID/var/adm/*/?-$x.* diff --git a/scripts/Create-FlatPriPatch b/scripts/Create-FlatPriPatch index 3b4fc22..d0d41f6 100755 --- a/scripts/Create-FlatPriPatch +++ b/scripts/Create-FlatPriPatch @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-FlatPriPatch # Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Create-ISO b/scripts/Create-ISO index 2ccc82e..ce4874e 100755 --- a/scripts/Create-ISO +++ b/scripts/Create-ISO @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-ISO # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -100,7 +100,7 @@ rm -f ${pathspec}* for cfg ; do id="$( grep '^export SDECFG_ID=' config/$cfg/config | cut -f2 -d"'" 2> /dev/null)" if ! cat build/$id/TOOLCHAIN/isofs.txt >> $dat 2> /dev/null - then + then echo "Not a valid build: $cfg" echo "build/$id/TOOLCHAIN/isofs.txt might be created." rm -f $dat $index ${pathspec}_* ; exit 1 @@ -356,5 +356,5 @@ done date "+ [%X] Done. Have fun!" echo -rm -f $index $dat ${pathspec}_* +rm -f $index $dat ${pathspec}_* diff --git a/scripts/Create-Links b/scripts/Create-Links index 1a6a88e..ba73f1f 100755 --- a/scripts/Create-Links +++ b/scripts/Create-Links @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-Links # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Create-ParaSim b/scripts/Create-ParaSim index 17e8571..8dee338 100755 --- a/scripts/Create-ParaSim +++ b/scripts/Create-ParaSim @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-ParaSim # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -17,7 +17,7 @@ config=default jobs="" ; x11=0 - + while [ "$1" ] ; do case "$1" in -cfg) config=$2 ; shift ; shift ;; @@ -27,7 +27,7 @@ while [ "$1" ] ; do "[ -jobs 1,4,8 ]" exit 1 ;; esac -done +done . lib/parse-config diff --git a/scripts/Create-ParaStatus b/scripts/Create-ParaStatus index 0908f0b..7e1c4c5 100755 --- a/scripts/Create-ParaStatus +++ b/scripts/Create-ParaStatus @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-ParaStatus # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -16,13 +16,13 @@ # --- SDE-COPYRIGHT-NOTE-END --- config=default - + while [ "$1" ] ; do case "$1" in -cfg) config=$2 ; shift ; shift ;; *) echo "Usage: $0 [ -cfg config ]" ; exit 1 ;; esac -done +done . lib/parse-config qdir="$base/build/$SDECFG_ID/TOOLCHAIN/queue" diff --git a/scripts/Create-PkgQueue b/scripts/Create-PkgQueue index 7f36308..6cacdbe 100755 --- a/scripts/Create-PkgQueue +++ b/scripts/Create-PkgQueue @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-PkgQueue # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -60,7 +60,7 @@ function check_package() { gsub("", "err", errfile); gsub("", "out", outfile); - + if ( (getline dummy < logfile == -1) && (getline dummy < errfile == -1) ) { build_this_package = 1; diff --git a/scripts/Create-SrcTar b/scripts/Create-SrcTar index 05b355f..45b7a84 100755 --- a/scripts/Create-SrcTar +++ b/scripts/Create-SrcTar @@ -1,14 +1,14 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Create-SrcTar # Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/Emerge-Pkg b/scripts/Emerge-Pkg index 92f515d..74d1e31 100755 --- a/scripts/Emerge-Pkg +++ b/scripts/Emerge-Pkg @@ -1,13 +1,13 @@ #!/bin/bash # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: scripts/Emerge-Pkg # Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -203,7 +203,7 @@ if [ $system -eq 1 ]; then done fi -case $deps in +case $deps in fast|indirect) # we have to create a complete dependency graph ... tmp=`mktemp` diff --git a/scripts/Find-Pkg b/scripts/Find-Pkg index f8d53d8..3bb7053 100755 --- a/scripts/Find-Pkg +++ b/scripts/Find-Pkg @@ -1,12 +1,12 @@ #!/bin/bash # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/Find-Pkg # Copyright (C) 2004 - 2006 The T2 SDE Project -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/create-cache.sh b/scripts/create-cache.sh index 9a77722..06ef44f 100644 --- a/scripts/create-cache.sh +++ b/scripts/create-cache.sh @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/create-cache.sh # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/parasim1.pl b/scripts/parasim1.pl index 0a9c23c..52812a5 100644 --- a/scripts/parasim1.pl +++ b/scripts/parasim1.pl @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/parasim1.pl # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/parasim2.pl b/scripts/parasim2.pl index 89d5f30..f2a86b4 100644 --- a/scripts/parasim2.pl +++ b/scripts/parasim2.pl @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/parasim2.pl # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -53,7 +53,7 @@ while (1) { open(Q, "./scripts/Create-PkgQueue -cfg $config " . "-logdir $logdir/logs_$id | sort -r -n -k2 |") || die $!; - while ($_= and $freejobs > 0) { + while ($_= and $freejobs > 0) { @_ = split /\s+/; $qid="$_[0]-$_[5]"; s/^.*\s(\S+)\s*$/$1/; $_++; printf LOG "%10d: Creating new job $qid " . diff --git a/scripts/parasim3.pl b/scripts/parasim3.pl index 6e504df..e3ae099 100644 --- a/scripts/parasim3.pl +++ b/scripts/parasim3.pl @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/parasim3.pl # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the diff --git a/scripts/patch-pp.pl b/scripts/patch-pp.pl index 383882a..ccd18af 100644 --- a/scripts/patch-pp.pl +++ b/scripts/patch-pp.pl @@ -2,13 +2,13 @@ # # --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # T2 SDE: scripts/patch-pp.pl # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf -# +# # More information can be found in the files COPYING and README. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the @@ -38,7 +38,7 @@ while () { $a.="/".$1; $skipit=1 if -l "$ARGV[0]/$a"; # print STDERR "Checked $a ($skipit)\n"; } - + } print $line unless $skipit; }