New commits:
commit aeca2c20dedef3850b7bf26a76dd58d6a36e2554
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
1.13.8-rc2
commit d1e885742af698f68f8c281ab7bcbbcfd11b2512
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libsorcery: fixed CXXFLAGS setting in optimise() to not also include the
other CFLAGS_* variables #13965
commit 8541362965c261e8f928cda2e4dd223b989db56f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
fixed "gaze from" matching state files #13941 and made it avoid passing
too many arguments to grep
(cherry picked from commit 7f6ee88f4196cfacd0d35a27afe681d5d98ff33a)
commit 84e63403550a777a97ac5b62164a7c6d29b090b7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
made the cleanse md5sum check handle (too) many logs, patch from Arwed
von Merkatz #13903
commit 15da4ffe7d6b081cc43a8b259cb65ab2a5c9fe4f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libressurect: show unified diffs in real_handle_changed_config #13830
(cherry picked from commit c6c717d7df365dbc0e2e5b147df216b15a6d4691)
commit fbd22e021bd36c17d4add48fc8e65feefae38691
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libmisc: fix set_architecture not resetting the text color #13842
commit 36a18ed9e9ce6b2def31bb203c3418e0769178ef
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
fix url_ftp_verify target matching #13787
(cherry picked from commit abd2d45c5df4a074c17cd8a525ae42c3363f8dbc)
commit a5bc8cbde3b8b7c069c1977c54d995c635848c3c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
fixed scribe add rm -rfing if the passed (bad) argument is a dir #13742
(cherry picked from commit f3cb2400df25d407d102d452957565a8d8fa60f7)
commit 56e72e1eb63059857eb70bfb448e2ba0dffa0b0b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
scribe: fixed bad messages when adding a grimoire #13743
(cherry picked from commit f2e33c9d5a19d5056f70d1ca2e2e74159adbb262)
commit bb1b0c251efdf0d1a4895a45fe825a24b84e618c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
liburl, scribe: don't ignore url_get_prefix exit status #13729
(cherry picked from commit 5727165c0b6d6ed9f587c2ed174a6d22560bbfd9)
commit 6b6ed1b961d5aaffe9187e686bc497f2d8c761e3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libsummon, scribe: added the missing prefixes to the guess lists #13732
commit 514270ab8f2c413a56dc32963adf165359e13b2f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
cleanse: fix md5sum check locale issue, patch from Thomas Orgis #13713
commit cf77432716e686492082af6a64052937cb100727
Author: David Kowis <dkowis AT shlrm.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gaze applied patch from bug 13711 thanks to Jaka Kranjc
plus 3ff76662d7238252ba5192cac24f9b9f3f206c59
commit a7f65f59bfd410e9c6607631065b3384ba6ecc9f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
added default for PER_CPAN_URL #13673
commit 733d5e3ccd12daa3889cec8dff5b297cadc422a4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gaze: fixed bad temporary dir usage #13588
(cherry picked from commit a8ce539dfdd39919e81b298a37b735948d802a3d)
Conflicts:
ChangeLog
usr/sbin/gaze
commit ce92a32ced2d1a4c48f4e5bd92690cabe0cf53b4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
fixed gaze newer breaking on bad input #10149
commit c8a5eebc5cd4e955354088d671d9647746f7961c
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
fix bug 11708
diff --git a/ChangeLog b/ChangeLog
index 36c9ea6..6e717f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,16 +20,45 @@
* libdepends: fixed some more quoting regressions since stable. Should
eliminate some bad provider query defaults
+2007-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: fixed CXXFLAGS setting in optimise() to not also
include the
+ other CFLAGS_* variables #13965
+
+2007-08-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: fixed bad temporary dir usage #13588
+ fixed "gaze from" matching state files #13941 and made it avoid
passing
+ too many arguments to grep
+ * libsummon, scribe: added the missing prefixes to the guess lists
#13732
+ * liburl, scribe: don't ignore url_get_prefix exit status #13729
+ * scribe: fixed bad messages when adding a grimoire #13743
+ fixed scribe add rm -rfing if the passed (bad) argument is a dir
#13742
+
2007-08-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcodex: moved the load_libcompat call before the sourcing of
DETAILS in
codex_set_current_spell. This way fallbacks can be used there as
well,
which will among other things help a bit with #13883
* libdepends: fixed a regression in private_add_depends;
probably fixes #13735
+ * gaze: fixed gaze newer breaking on bad input #10149
+ also made it handle (too) many logs, patch from Arwed von Merkatz
#13903
+ * cleanse: fix md5sum check locale issue, patch from Thomas Orgis
#13713
+ * libmisc: fix set_architecture not resetting the text color #13842
+ * libressurect: show unified diffs in real_handle_changed_config
#13830
+
+2007-08-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * etc/sorcery/url: added default value for PERL_CPAN_URL #13673
2007-08-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* url_handlers/url_http: fix url_ftp_verify to not pass a deprecated
wget
option. Now it works again. #13001
+ Also made it stricter when checking for target exsistance #13787
+
+2007-04-18 David Kowis <dkowis AT shlrm.org>
+ * gaze: Bug 13711, support force_depends in gaze dependencies.
+ Patch from Jaka Kranjc
+
+2006-11-25 Andrew Stitt <astitt AT sourcemage.org>
+ * cabal: apply patch from Dave Josephsen, bug 11708
#--------------------
## Overwrite the cabal name file with new member names
-## @Note The loop can probably be done more intelegently, so a MAX_CABALS is
not necessary.
## @Globals CABAL_NAMES MAX_CABALS
#--------------------
function write_cabal_names() {
rm -f $CABAL_NAMES
- for (( COUNT=0; COUNT != MAX_CABALS; COUNT++ )); do
+ for (( COUNT=0; COUNT != ${#CABALS[@]}; COUNT++ )); do
echo "${CABALS[$COUNT]}" >> $CABAL_NAMES
done
@@ -45,9 +45,11 @@ function write_cabal_names() {
#---------------------
function print_cabal_names() {
@@ -257,7 +259,7 @@ function cabal_name_menu() {
do
case $COMMAND in
- S) print_cabal_names | $PAGER ;;
+ S) print_cabal_names ;;
E) name_cabals ;;
esac
@@ -379,16 +381,16 @@ function cabal_admin_menu() {
function cabal_copy() {
- SOURCE_MESSAGE="Please enter source files and directories."
- DEST_MESSAGE="Please enter destination directory."
+ SOURCE_MESSAGE='"Please enter source files and directories."'
+ DEST_MESSAGE='"Please enter destination directory."'
mkdir -p $CABAL_OUTPUT || {
messasge "Failed to make CABAL_OUTPUT directory $CABAL_OUTPUT"
exit 1
}
-#---------------------------------------------------------------------
+##---------------------------------------------------------------------
##=back
##
##=head1 LICENSE
@@ -554,4 +583,4 @@ cabal_menu
## along with this software; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##
-#---------------------------------------------------------------------
+##---------------------------------------------------------------------
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 59854e5..266d3c9 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -911,7 +911,7 @@ function cleanse_fix_md5sum_check() {
# for some reason stuffing the output of this in a variable loses the
# newlines and thus files with spaces in them get lost
- md5sum --check $TMP_MD5_LOG 2>/dev/null | grep ': FAILED$' |
+ LANG=C md5sum --check $TMP_MD5_LOG 2>/dev/null | grep ': FAILED$' |
sed "s${A}: FAILED\$${A}${A}" > $BROKEN1
# cant use awk above with : as a seperator due to files with :'s in their
name
@@ -937,7 +937,7 @@ function cleanse_fix_md5sum_check() {
test -h $LINE && continue
REAL_MD5=$(md5sum $LINE)
# find the file in some log somewhere...
- FOUND_IN=$(grep -l "^$REAL_MD5\$" $MD5SUM_LOGS/*)
+ FOUND_IN=$(echo $MD5SUM_LOGS/* | xargs grep -l "^$REAL_MD5\$")
# remove anything from a non-current version of the spell
# this is ugly but the only reasonable way I know of to do this...
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 57acb21..1630fbd 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -519,6 +519,9 @@ function newer() {
COMPUTE='($3=="update") { a=a+1; if (a>1) { print $1 ; exit } }'
elif [ x"$DATE" == x"last_cast" ]; then
COMPUTE='($3 == "cast" && $6 == "success") { print $1 ; exit }'
+ elif ! date -d "$DATE" +%Y%m%d > /dev/null; then
+ help | $PAGER
+ exit 1
fi
if [ -n "$COMPUTE" ]; then
@@ -575,14 +578,16 @@ function older() {
}
#-----
-## Find all install logs that mention the given string
+## Find all install logs that mention the given string,
+## discarding hits that match state files
## @param Search string
## @Stdout grep results
#-----
function show_from() {