diff --git a/.gitattributes b/.gitattributes index fbc49e0..604444f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,5 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns +e2fsprogs-1.41.0.de.po filter=lfs diff=lfs merge=lfs -text e2fsprogs-no_cmd_hiding.patch filter=lfs diff=lfs merge=lfs -text diff --git a/e2fsprogs-1.41.0-fix_messages.patch b/e2fsprogs-1.41.0-fix_messages.patch new file mode 100644 index 0000000..e1a8b8e --- /dev/null +++ b/e2fsprogs-1.41.0-fix_messages.patch @@ -0,0 +1,22 @@ +--- misc/partinfo.c ++++ misc/partinfo.c +@@ -43,7 +43,7 @@ + #endif + if (argc == 1) { + fprintf(stderr, _("Usage: %s device...\n\nPrints out the" +- "partition information for each given device.\n"), ++ " partition information for each given device.\n"), + "For example: %s /dev/hda\n\n", argv[0], argv[0]); + exit(1); + } +--- resize/online.c ++++ resize/online.c +@@ -178,7 +178,7 @@ + return 0; + #else + printf(_("Filesystem at %s is mounted on %s, and on-line resizing is" +- "not supported on this system.\n"), fs->device_name, mtpt); ++ " not supported on this system.\n"), fs->device_name, mtpt); + exit(1); + #endif + } diff --git a/e2fsprogs-1.41.0.de.po b/e2fsprogs-1.41.0.de.po new file mode 100644 index 0000000..80a5ed2 --- /dev/null +++ b/e2fsprogs-1.41.0.de.po @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe0ccf6cbc3157ffa6492a0599052c65ae2ace0ddd741d24be780f9f2dc25b1b +size 144353 diff --git a/e2fsprogs-base_devt.patch b/e2fsprogs-base_devt.patch index 30dc61d..c4c2ce5 100644 --- a/e2fsprogs-base_devt.patch +++ b/e2fsprogs-base_devt.patch @@ -1,5 +1,5 @@ ---- e2fsprogs-1.39/misc/base_device.c -+++ e2fsprogs-1.39/misc/base_device.c +--- e2fsprogs-1.41.0/misc/base_device.c ++++ e2fsprogs-1.41.0/misc/base_device.c @@ -31,125 +31,170 @@ #include "fsck.h" @@ -286,9 +286,9 @@ } exit(0); } ---- e2fsprogs-1.39/misc/fsck.c -+++ e2fsprogs-1.39/misc/fsck.c -@@ -233,8 +233,6 @@ +--- e2fsprogs-1.41.0/misc/fsck.c ++++ e2fsprogs-1.41.0/misc/fsck.c +@@ -235,8 +235,6 @@ free(i->prog); if (i->device) free(i->device); @@ -297,7 +297,7 @@ free(i); return; } -@@ -389,7 +387,7 @@ +@@ -388,7 +386,7 @@ return NULL; for (fs = filesys_info; fs; fs = fs->next) { @@ -306,7 +306,7 @@ (fs->mountpt && !strcmp(filesys, fs->mountpt))) break; } -@@ -502,7 +500,7 @@ +@@ -512,7 +510,7 @@ inst->prog = string_copy(prog); inst->type = string_copy(type); inst->device = string_copy(device); @@ -315,7 +315,7 @@ inst->start_time = time(0); inst->next = NULL; -@@ -905,7 +903,7 @@ +@@ -925,7 +923,7 @@ static int device_already_active(char *device) { struct fsck_instance *inst; @@ -324,7 +324,7 @@ if (force_all_parallel) return 0; -@@ -918,20 +916,19 @@ +@@ -938,20 +936,19 @@ return 1; #endif @@ -349,14 +349,14 @@ return 0; } ---- e2fsprogs-1.39/misc/fsck.h -+++ e2fsprogs-1.39/misc/fsck.h -@@ -62,9 +62,9 @@ +--- e2fsprogs-1.41.0/misc/fsck.h ++++ e2fsprogs-1.41.0/misc/fsck.h +@@ -62,12 +62,12 @@ char * prog; char * type; char * device; - char * base_device; -+ dev_t base_devt; ++ dev_t base_devt; struct fsck_instance *next; }; @@ -364,3 +364,6 @@ -extern const char *identify_fs(const char *fs_name, const char *fs_types); +extern dev_t base_devt(const char *device); +extern int match_device(const char *dev1, const char *dev2); + + /* ismounted.h */ + extern int is_mounted(const char *file); diff --git a/e2fsprogs-libvolume_id-support.patch b/e2fsprogs-libvolume_id-support.patch index d579e5f..d84f623 100644 --- a/e2fsprogs-libvolume_id-support.patch +++ b/e2fsprogs-libvolume_id-support.patch @@ -1,8 +1,8 @@ Index: misc/Makefile.in -=================================================================== ---- misc/Makefile.in.orig +================================================================================ +--- misc/Makefile.in +++ misc/Makefile.in -@@ -40,7 +40,7 @@ UUIDD_OBJS= uuidd.o +@@ -40,7 +40,7 @@ DUMPE2FS_OBJS= dumpe2fs.o BADBLOCKS_OBJS= badblocks.o E2IMAGE_OBJS= e2image.o @@ -10,8 +10,8 @@ Index: misc/Makefile.in +FSCK_OBJS= fsck.o base_device.o ismounted.o fsck_udev.o BLKID_OBJS= blkid.o FILEFRAG_OBJS= filefrag.o - -@@ -62,6 +62,9 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(ST + E2UNDO_OBJS= e2undo.o +@@ -64,6 +64,9 @@ LIBS_BLKID= $(LIBBLKID) $(LIBUUID) DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) @@ -21,7 +21,7 @@ Index: misc/Makefile.in LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) -@@ -117,10 +120,6 @@ base_device: base_device.c +@@ -123,10 +126,6 @@ @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ -DDEBUG -o base_device @@ -32,7 +32,7 @@ Index: misc/Makefile.in mklost+found: $(MKLPF_OBJS) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) -@@ -157,9 +156,9 @@ dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $( +@@ -163,9 +162,9 @@ @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ $(LIBS_E2P) $(LIBUUID) $(LIBINTL) @@ -44,9 +44,7 @@ Index: misc/Makefile.in badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) @echo " LD $@" -Index: misc/base_device.c -=================================================================== ---- misc/base_device.c.orig +--- misc/base_device.c +++ misc/base_device.c @@ -27,6 +27,8 @@ #endif @@ -57,9 +55,7 @@ Index: misc/base_device.c #include "fsck.h" -Index: misc/fsck.c -=================================================================== ---- misc/fsck.c.orig +--- misc/fsck.c +++ misc/fsck.c @@ -59,7 +59,6 @@ #include "../version.h" @@ -69,7 +65,7 @@ Index: misc/fsck.c #ifndef _PATH_MNTTAB #define _PATH_MNTTAB "/etc/fstab" -@@ -118,7 +117,6 @@ struct fs_info *filesys_info = NULL, *fi +@@ -120,7 +119,6 @@ struct fsck_instance *instance_list; const char *fsck_prefix_path = "/sbin:/sbin/fs.d:/sbin/fs:/etc/fs:/etc"; char *fsck_path = 0; @@ -77,7 +73,7 @@ Index: misc/fsck.c static char *string_copy(const char *s) { -@@ -294,7 +292,7 @@ static int parse_fstab_line(char *line, +@@ -296,7 +294,7 @@ parse_escape(freq); parse_escape(passno); @@ -86,7 +82,7 @@ Index: misc/fsck.c if (dev) device = dev; -@@ -319,7 +317,7 @@ static void interpret_type(struct fs_inf +@@ -321,7 +319,7 @@ if (strcmp(fs->type, "auto") != 0) return; @@ -95,7 +91,7 @@ Index: misc/fsck.c if (t) { free(fs->type); fs->type = t; -@@ -1106,7 +1104,7 @@ static void PRS(int argc, char *argv[]) +@@ -1119,7 +1117,7 @@ progname); exit(EXIT_ERROR); } @@ -104,7 +100,7 @@ Index: misc/fsck.c if (!dev && strchr(arg, '=')) { /* * Check to see if we failed because -@@ -1252,7 +1250,7 @@ int main(int argc, char *argv[]) +@@ -1265,7 +1263,7 @@ bindtextdomain(NLS_CAT_NAME, LOCALEDIR); textdomain(NLS_CAT_NAME); #endif @@ -113,7 +109,7 @@ Index: misc/fsck.c PRS(argc, argv); if (!notitle) -@@ -1323,6 +1321,6 @@ int main(int argc, char *argv[]) +@@ -1336,6 +1334,6 @@ } status |= wait_many(FLAG_WAIT_ALL); free(fsck_path); @@ -121,23 +117,20 @@ Index: misc/fsck.c + fsck_put_cache(); return status; } -Index: misc/fsck.h -=================================================================== ---- misc/fsck.h.orig +--- misc/fsck.h +++ misc/fsck.h -@@ -68,3 +68,9 @@ struct fsck_instance { - +@@ -69,5 +69,10 @@ extern dev_t base_devt(const char *device); extern int match_device(const char *dev1, const char *dev2); -+ + +extern int fsck_get_cache(const char *filename); +extern void fsck_put_cache(void); +extern char *fsck_get_devname(const char *device); +extern char *fsck_get_fstype(const char *device); + -Index: misc/fsck_blkid.c -=================================================================== ---- /dev/null + /* ismounted.h */ + extern int is_mounted(const char *file); +--- misc/fsck_blkid.c +++ misc/fsck_blkid.c @@ -0,0 +1,29 @@ +/* @@ -169,9 +162,7 @@ Index: misc/fsck_blkid.c + return blkid_get_tag_value(cache, "TYPE", device); +} + -Index: misc/fsck_udev.c -=================================================================== ---- /dev/null +--- misc/fsck_udev.c +++ misc/fsck_udev.c @@ -0,0 +1,188 @@ +/* diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 6e46638..a9163fb 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Aug 21 18:06:13 CEST 2008 - pth@suse.de + +- Add current german messages. +- Fix e2fsprogs-base_devt.patch and e2fsprogs-libvolume_id-support.patch + so that the package tools work. +- Add missing space to two messages and resync message + catalogs by configuring with --enable-maintainer-mode. + ------------------------------------------------------------------- Wed Aug 20 12:46:37 CEST 2008 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 5a4ab3f..c0ed341 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -27,13 +27,14 @@ Supplements: filesystem(ext2) filesystem(ext3) PreReq: %install_info_prereq AutoReqProv: on Version: 1.41.0 -Release: 16 +Release: 17 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 Source2: README.SUSE Source3: uuidd.rc Source4: sysconfig.uuidd +Source5: e2fsprogs-1.41.0.de.po # # e2fsprogs patches # @@ -42,6 +43,7 @@ Patch2: e2fsprogs-base_devt.patch Patch3: e2fsprogs-libvolume_id-support.patch Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch Patch6: e2fsprogs-1.41.0-tst_link_fix.patch +Patch7: e2fsprogs-1.41.0-fix_messages.patch # libcom_err patches # 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict Patch31: libcom_err-no-init_error_table.patch @@ -245,6 +247,7 @@ Authors: %patch3 -p0 %patch5 -p1 %patch6 -p1 +%patch7 # libcom_err patches %patch31 -p1 %patch32 -p1 @@ -254,6 +257,7 @@ Authors: %patch99 -p1 %endif cp %{SOURCE2} . +cp %{S:5} po/de.po %build %{?suse_update_config:%{suse_update_config -f}} @@ -265,6 +269,7 @@ cp %{SOURCE2} . --libdir=%{_libdir} \ --enable-elf-shlibs \ --disable-evms \ + --enable-maintainer-mode \ CFLAGS="$RPM_OPT_FLAGS" make @@ -464,6 +469,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/com_err.3.gz %changelog +* Thu Aug 21 2008 pth@suse.de +- Add current german messages. +- Fix e2fsprogs-base_devt.patch and e2fsprogs-libvolume_id-support.patch + so that the package tools work. +- Add missing space to two messages and resync message + catalogs by configuring with --enable-maintainer-mode. * Wed Aug 20 2008 mkoenig@suse.de - add uuid related manpages to uuid-runtime subpackage [bnc#418568] * Mon Aug 18 2008 mkoenig@suse.de