From: Theodore Ts'o Date: Tue, 6 May 2003 00:02:39 +0000 (-0400) Subject: Update Debian changelog. X-Git-Tag: E2FSPROGS-1_34-WIP-0521~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b16fb628bf9035363002ca7ab72992624f4bb3cf;p=thirdparty%2Fe2fsprogs.git Update Debian changelog. Add support for OV-style continuation (closes Debian bug #191900). Move /usr/include/com_err.h from the e2fslibs-dev package to the comerr-dev package. (closes Debian bug #191899) --- diff --git a/debian/changelog b/debian/changelog index fac89ac5c..8cdf496b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +e2fsprogs (1.33-2) unstable; urgency=low + + * Fix up NLS support + - Fix message abbreviations support (i.e., @g --> group) + - Update to gettext 0.11.5 + - Add Czech translation + - Install message catalogs + - Other miscellaneous NLS bug fixes + * Add new debugfs command, imap, which prints the location of a + specified inode in the inode table. + * Put /usr/include/com_err.h in comerr-dev instead of e2fslibs-dev. + (Closes #191899) + * Add support for OV-style continuations in compile_et. (Closes #191900) + + -- Theodore Y. Ts'o Mon, 5 May 2003 18:13:12 -0400 + e2fsprogs (1.33-1) unstable; urgency=low * New upstream version (Closes: #189687) diff --git a/debian/comerr-dev.files b/debian/comerr-dev.files index 8aeb7c3dc..aa1bed0d8 100644 --- a/debian/comerr-dev.files +++ b/debian/comerr-dev.files @@ -1,6 +1,7 @@ usr/lib/libcom_err.a usr/lib/libcom_err.so usr/include/et/* +usr/include/com_err.h usr/share/man/man1/compile_et* usr/share/man/man3/com_err.3* usr/bin/compile_et diff --git a/debian/e2fslibs-dev.files b/debian/e2fslibs-dev.files index 57211dd56..7c69e2e46 100644 --- a/debian/e2fslibs-dev.files +++ b/debian/e2fslibs-dev.files @@ -2,5 +2,4 @@ usr/lib/*.so usr/lib/*.a usr/include/ext2fs usr/include/e2p -usr/include/com_err.h usr/share/info/libext2fs.info* diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 983fde559..bc89c6b75 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,10 @@ +2003-05-05 Theodore Ts'o + + * et_c.awk: Add support for OV-style continuations in compile_et. + (Closes Debian bug #191900). + + * Makefile.in: Add regression test suite for compile_et. + 2003-04-21 Theodore Ts'o * Release of E2fsprogs 1.33 diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index 4a9e5382d..06371eb7b 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -106,6 +106,18 @@ uninstall:: $(DESTDIR)$(bindir)/compile_et $(RM) -rf $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et +check:: compile_et + for i in $(srcdir)/test_cases/*.et ; do \ + t=`basename $$i | sed -e 's/.et//'`; \ + ./compile_et --build-tree $$i ; \ + diff -c $(srcdir)/test_cases/$$t.c $$t.c > $$t.failed; \ + if [ $$? -ne 0 ]; then echo Test case $$t failed; exit 1 ; fi ; \ + diff -c $(srcdir)/test_cases/$$t.h $$t.h >> $$t.failed; \ + if [ $$? -ne 0 ]; then echo Test case $$t failed; exit 1 ; fi ; \ + $(RM) -f $$t.c $$t.h $$t.failed; \ + echo "Test case $$t succeeded" ; \ + done + clean:: $(RM) -f compile_et libcom_err.a libcom_err_p.a $(RM) -f $(OBJS) profiled/* diff --git a/lib/et/et_c.awk b/lib/et/et_c.awk index 66923e47b..a48ecfd94 100644 --- a/lib/et/et_c.awk +++ b/lib/et/et_c.awk @@ -122,7 +122,20 @@ c2n["_"]=63 table_item_count = 0 } +(continuation == 1) && ($0 ~ /\\[ \t]*$/) { + text=substr($0,1,length($0)-1); +# printf "\t\t\"%s\"\n", text > outfile + cont_buf=cont_buf text; +} + +(continuation == 1) && ($0 ~ /"[ \t]*$/) { +# printf "\t\t\"%s,\n", $0 > outfile + printf "\t%s,\n", cont_buf $0 > outfile + continuation = 0; +} + /^[ \t]*(error_code|ec)[ \t]+[A-Z_0-9]+,[ \t]*$/ { + table_item_count++ skipone=1 next } @@ -137,10 +150,30 @@ c2n["_"]=63 table_item_count++ } +/^[ \t]*(error_code|ec)[ \t]+[A-Z_0-9]+,[ \t]*".*\\[ \t]*$/ { + text="" + for (i=3; i<=NF; i++) { + text = text FS $i + } + text=substr(text,2,length(text)-2); +# printf "\t%s\"\n", text > outfile + cont_buf=text + continuation++; +} + +/^[ \t]*".*\\[ \t]*$/ { + if (skipone) { + text=substr($0,1,length($0)-1); +# printf "\t%s\"\n", text > outfile + cont_buf=text + continuation++; + } + skipone=0 +} + { if (skipone) { printf "\t%s,\n", $0 > outfile - table_item_count++ } skipone=0 } diff --git a/lib/et/test_cases/continuation.c b/lib/et/test_cases/continuation.c new file mode 100644 index 000000000..d63fb868a --- /dev/null +++ b/lib/et/test_cases/continuation.c @@ -0,0 +1,34 @@ +/* + * continuation.c: + * This file is automatically generated; please do not edit it. + */ + +static const char * const text[] = { + "New password was found in a dictionary of possible passwords and\ntherefore may be easily guessed. Please choose another password.\nSee the ovpasswd man page for help in choosing a good password.", + 0 +}; + +struct error_table { + char const * const * msgs; + long base; + int n_msgs; +}; +struct et_list { + struct et_list *next; + const struct error_table * table; +}; +extern struct et_list *_et_list; + +const struct error_table et_kadm5_error_table = { text, 156463126912L, 1 }; + +static struct et_list link = { 0, 0 }; + +void initialize_kadm5_error_table(void); + +void initialize_kadm5_error_table(void) { + if (!link.table) { + link.next = _et_list; + link.table = &et_kadm5_error_table; + _et_list = &link; + } +} diff --git a/lib/et/test_cases/continuation.et b/lib/et/test_cases/continuation.et new file mode 100644 index 000000000..de413798c --- /dev/null +++ b/lib/et/test_cases/continuation.et @@ -0,0 +1,8 @@ + error_table kadm5 + +error_code CHPASS_UTIL_PASSWORD_IN_DICTIONARY, +"New password was found in a dictionary of possible passwords and\n\ +therefore may be easily guessed. Please choose another password.\n\ +See the ovpasswd man page for help in choosing a good password." + + end diff --git a/lib/et/test_cases/continuation.h b/lib/et/test_cases/continuation.h new file mode 100644 index 000000000..3dc277556 --- /dev/null +++ b/lib/et/test_cases/continuation.h @@ -0,0 +1,15 @@ +/* + * continuation.h: + * This file is automatically generated; please do not edit it. + */ + +#include + +#define CHPASS_UTIL_PASSWORD_IN_DICTIONARY (156463126912L) +extern const struct error_table et_kadm5_error_table; +extern void initialize_kadm5_error_table(void); +#define ERROR_TABLE_BASE_kadm5 (156463126912L) + +/* for compatibility with older versions... */ +#define init_kadm5_err_tbl initialize_kadm5_error_table +#define kadm5_err_base ERROR_TABLE_BASE_kadm5 diff --git a/lib/et/test_cases/simple.c b/lib/et/test_cases/simple.c new file mode 100644 index 000000000..2f7079955 --- /dev/null +++ b/lib/et/test_cases/simple.c @@ -0,0 +1,55 @@ +/* + * simple.c: + * This file is automatically generated; please do not edit it. + */ + +static const char * const text[] = { + "Can't read ticket file", + "Can't find ticket or TGT", + "TGT expired", + "Can't decode authenticator", + "Ticket expired", + "Repeated request", + "The ticket isn't for us", + "Request is inconsistent", + "Delta-T too big", + "Incorrect net address", + "Protocol version mismatch", + "Invalid message type", + "Message stream modified", + "Message out of order", + "Unauthorized request", + "Current password is null", + "Incorrect current password", + "Protocol error", + "Error returned by KDC", + "Null ticket returned by KDC", + "Retry count exceeded", + "Can't send request", + 0 +}; + +struct error_table { + char const * const * msgs; + long base; + int n_msgs; +}; +struct et_list { + struct et_list *next; + const struct error_table * table; +}; +extern struct et_list *_et_list; + +const struct error_table et_krb_error_table = { text, 39525376L, 22 }; + +static struct et_list link = { 0, 0 }; + +void initialize_krb_error_table(void); + +void initialize_krb_error_table(void) { + if (!link.table) { + link.next = _et_list; + link.table = &et_krb_error_table; + _et_list = &link; + } +} diff --git a/lib/et/test_cases/simple.et b/lib/et/test_cases/simple.et new file mode 100644 index 000000000..4c7b77f0e --- /dev/null +++ b/lib/et/test_cases/simple.et @@ -0,0 +1,69 @@ + error_table krb + + error_code KRB_MK_AP_TKFIL, + "Can't read ticket file" + + ec KRB_MK_AP_NOTKT, + "Can't find ticket or TGT" + + ec KRB_MK_AP_TGTEXP, + "TGT expired" + + ec KRB_RD_AP_UNDEC, + "Can't decode authenticator" + + ec KRB_RD_AP_EXP, + "Ticket expired" + + ec KRB_RD_AP_REPEAT, + "Repeated request" + + ec KRB_RD_AP_NOT_US, + "The ticket isn't for us" + + ec KRB_RD_AP_INCON, + "Request is inconsistent" + + ec KRB_RD_AP_TIME, + "Delta-T too big" + + ec KRB_RD_AP_BADD, + "Incorrect net address" + + ec KRB_RD_AP_VERSION, + "Protocol version mismatch" + + ec KRB_RD_AP_MSG_TYPE, + "Invalid message type" + + ec KRB_RD_AP_MODIFIED, + "Message stream modified" + + ec KRB_RD_AP_ORDER, + "Message out of order" + + ec KRB_RD_AP_UNAUTHOR, + "Unauthorized request" + + ec KRB_GT_PW_NULL, + "Current password is null" + + ec KRB_GT_PW_BADPW, + "Incorrect current password" + + ec KRB_GT_PW_PROT, + "Protocol error" + + ec KRB_GT_PW_KDCERR, + "Error returned by KDC" + + ec KRB_GT_PW_NULLTKT, + "Null ticket returned by KDC" + + ec KRB_SKDC_RETRY, + "Retry count exceeded" + + ec KRB_SKDC_CANT, + "Can't send request" + + end diff --git a/lib/et/test_cases/simple.h b/lib/et/test_cases/simple.h new file mode 100644 index 000000000..c6aa024b4 --- /dev/null +++ b/lib/et/test_cases/simple.h @@ -0,0 +1,36 @@ +/* + * simple.h: + * This file is automatically generated; please do not edit it. + */ + +#include + +#define KRB_MK_AP_TKFIL (39525376L) +#define KRB_MK_AP_NOTKT (39525377L) +#define KRB_MK_AP_TGTEXP (39525378L) +#define KRB_RD_AP_UNDEC (39525379L) +#define KRB_RD_AP_EXP (39525380L) +#define KRB_RD_AP_REPEAT (39525381L) +#define KRB_RD_AP_NOT_US (39525382L) +#define KRB_RD_AP_INCON (39525383L) +#define KRB_RD_AP_TIME (39525384L) +#define KRB_RD_AP_BADD (39525385L) +#define KRB_RD_AP_VERSION (39525386L) +#define KRB_RD_AP_MSG_TYPE (39525387L) +#define KRB_RD_AP_MODIFIED (39525388L) +#define KRB_RD_AP_ORDER (39525389L) +#define KRB_RD_AP_UNAUTHOR (39525390L) +#define KRB_GT_PW_NULL (39525391L) +#define KRB_GT_PW_BADPW (39525392L) +#define KRB_GT_PW_PROT (39525393L) +#define KRB_GT_PW_KDCERR (39525394L) +#define KRB_GT_PW_NULLTKT (39525395L) +#define KRB_SKDC_RETRY (39525396L) +#define KRB_SKDC_CANT (39525397L) +extern const struct error_table et_krb_error_table; +extern void initialize_krb_error_table(void); +#define ERROR_TABLE_BASE_krb (39525376L) + +/* for compatibility with older versions... */ +#define init_krb_err_tbl initialize_krb_error_table +#define krb_err_base ERROR_TABLE_BASE_krb