]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Update Debian changelog.
authorTheodore Ts'o <tytso@mit.edu>
Tue, 6 May 2003 00:02:39 +0000 (20:02 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 6 May 2003 00:02:39 +0000 (20:02 -0400)
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)

12 files changed:
debian/changelog
debian/comerr-dev.files
debian/e2fslibs-dev.files
lib/et/ChangeLog
lib/et/Makefile.in
lib/et/et_c.awk
lib/et/test_cases/continuation.c [new file with mode: 0644]
lib/et/test_cases/continuation.et [new file with mode: 0644]
lib/et/test_cases/continuation.h [new file with mode: 0644]
lib/et/test_cases/simple.c [new file with mode: 0644]
lib/et/test_cases/simple.et [new file with mode: 0644]
lib/et/test_cases/simple.h [new file with mode: 0644]

index fac89ac5cb6391df4b5392296dae3a8717ffcd00..8cdf496b9ad870e0f46a68444736e51983b16788 100644 (file)
@@ -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 <tytso@mit.edu>  Mon,  5 May 2003 18:13:12 -0400
+
 e2fsprogs (1.33-1) unstable; urgency=low
 
   * New upstream version (Closes: #189687)
index 8aeb7c3dcf5d9c0968a5a13f9ce0114eda301b87..aa1bed0d8e65046c38e867a3567cf221ccc70674 100644 (file)
@@ -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
index 57211dd562d1b459d19bde6cb72ad34885839c11..7c69e2e463e4e2697c11e7260cbef422322166bf 100644 (file)
@@ -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*
index 983fde559249e5b77c482bbbbd2b45695ba63f24..bc89c6b758029cd5ed59d1fe619c88b27a310ed1 100644 (file)
@@ -1,3 +1,10 @@
+2003-05-05  Theodore Ts'o  <tytso@mit.edu>
+
+       * 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  <tytso@mit.edu>
 
        * Release of E2fsprogs 1.33
index 4a9e5382d34330837f514c76dba4db93c0aac8b2..06371eb7b1db46e53a2d70f4499cb3f602abcbdf 100644 (file)
@@ -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/*
index 66923e47be99a3da140c74244ddc58d0ca6b8f7d..a48ecfd946f05eccc31f2e2bda1dd410dbc5fb02 100644 (file)
@@ -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 (file)
index 0000000..d63fb86
--- /dev/null
@@ -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 (file)
index 0000000..de41379
--- /dev/null
@@ -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 (file)
index 0000000..3dc2775
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+ * continuation.h:
+ * This file is automatically generated; please do not edit it.
+ */
+
+#include <et/com_err.h>
+
+#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 (file)
index 0000000..2f70799
--- /dev/null
@@ -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 (file)
index 0000000..4c7b77f
--- /dev/null
@@ -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 (file)
index 0000000..c6aa024
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * simple.h:
+ * This file is automatically generated; please do not edit it.
+ */
+
+#include <et/com_err.h>
+
+#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