mslacken/e2fsprogs
1
0
Fork 0
forked from pool/e2fsprogs
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rev openSUSE:Factory/29 Md5 b37091f406326a7a0132e9d25402921a 2008-06-24 20:20:16 unknown None

Browse Source
This commit is contained in:
OBS User unknown 2008-06-24 20:20:16 +00:00 committed by Git OBS Bridge
parent 31aabf731e
commit a644347ab7
10 changed files with 44 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -20,6 +20,4 @@
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
e2fsprogs-1.40.7.de.po filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

3
e2fsprogs-1.40.11.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9cb28087c64794a351f2f7c50e9bdb54549a36cbaddd53beb67ac4bb7f5ae310
size 3665533

122
e2fsprogs-1.40.7-uuidd_security.patch
View File

@ -1,122 +0,0 @@
Index: e2fsprogs-1.40.7/misc/uuidd.c
===================================================================
--- e2fsprogs-1.40.7.orig/misc/uuidd.c
+++ e2fsprogs-1.40.7/misc/uuidd.c
@@ -52,6 +52,14 @@ static void usage(const char *progname)
exit(1);
}
+
+static void die(const char *msg)
+{
+ perror(msg);
+ exit(1);
+}
+
+
static void create_daemon(void)
{
pid_t pid;
@@ -75,7 +83,8 @@ static void create_daemon(void)
chdir("/");
(void) setsid();
euid = geteuid();
- (void) setreuid(euid, euid);
+ if (setreuid(euid, euid) < 0)
+ die("setreuid");
}
static int read_all(int fd, char *buf, size_t count)
@@ -132,7 +141,7 @@ static int call_daemon(const char *socke
}
srv_addr.sun_family = AF_UNIX;
- strcpy(srv_addr.sun_path, socket_path);
+ snprintf(srv_addr.sun_path, sizeof(srv_addr.sun_path), "%s", socket_path);
if (connect(s, (const struct sockaddr *) &srv_addr,
sizeof(struct sockaddr_un)) < 0) {
@@ -252,7 +261,7 @@ static void server_loop(const char *sock
* Create the address we will be binding to.
*/
my_addr.sun_family = AF_UNIX;
- strcpy(my_addr.sun_path, socket_path);
+ snprintf(my_addr.sun_path, sizeof(my_addr.sun_path), "%s", socket_path);
(void) unlink(socket_path);
save_umask = umask(0);
if (bind(s, (const struct sockaddr *) &my_addr,
@@ -415,11 +424,11 @@ int main(int argc, char **argv)
switch (c) {
case 'd':
debug++;
- drop_privs++;
+ drop_privs = 1;
break;
case 'k':
do_kill++;
- drop_privs++;
+ drop_privs = 1;
break;
case 'n':
num = strtol(optarg, &tmp, 0);
@@ -429,18 +438,18 @@ int main(int argc, char **argv)
}
case 'p':
pidfile_path = optarg;
- drop_privs++;
+ drop_privs = 1;
break;
case 'q':
quiet++;
break;
case 's':
socket_path = optarg;
- drop_privs++;
+ drop_privs = 1;
break;
case 't':
do_type = UUIDD_OP_TIME_UUID;
- drop_privs++;
+ drop_privs = 1;
break;
case 'T':
timeout = strtol(optarg, &tmp, 0);
@@ -451,7 +460,7 @@ int main(int argc, char **argv)
break;
case 'r':
do_type = UUIDD_OP_RANDOM_UUID;
- drop_privs++;
+ drop_privs = 1;
break;
default:
usage(argv[0]);
@@ -460,17 +469,23 @@ int main(int argc, char **argv)
uid = getuid();
if (uid && drop_privs) {
gid = getgid();
-#ifdef HAVE_SETRESUID
- setresuid(uid, uid, uid);
+#ifdef HAVE_SETRESGID
+ if (setresgid(gid, gid, gid) < 0)
+ die("setresgid");
#else
- setreuid(uid, uid);
+ if (setregid(gid, gid) < 0)
+ die("setregid");
#endif
-#ifdef HAVE_SETRESGID
- setresgid(gid, gid, gid);
+
+#ifdef HAVE_SETRESUID
+ if (setresuid(uid, uid, uid) < 0)
+ die("setresuid");
#else
- setregid(gid, gid);
+ if (setreuid(uid, uid) < 0)
+ die("setreuid");
#endif
}
+
if (num && do_type) {
ret = call_daemon(socket_path, do_type+2, buf,
sizeof(buf), &num, &err_context);

3
e2fsprogs-1.40.7.de.po
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bd29386e6136e811377cf263fe5cc6e74f35a6ee2668664f549b6e49a5cefe6
size 133030

13
e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
View File

@ -1,13 +0,0 @@
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c
index 22e79a5..f7fd7b6 100644
--- a/e2fsck/recovery.c
+++ b/e2fsck/recovery.c
@@ -473,7 +473,7 @@ static int do_one_pass(journal_t *journal,
memcpy(nbh->b_data, obh->b_data,
journal->j_blocksize);
if (flags & JFS_FLAG_ESCAPE) {
- *((unsigned int *)bh->b_data) =
+ *((unsigned int *)nbh->b_data) =
htonl(JFS_MAGIC_NUMBER);
}

26
e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
View File

@ -1,26 +0,0 @@
diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index 6576c59..e07e87c 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -133,7 +133,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
struct ext2_inode_large *f, int hostorder,
int bufsize)
{
- unsigned i, has_data_blocks, extra_isize;
+ unsigned i, has_data_blocks, extra_isize, attr_magic;
int islnk = 0;
__u32 *eaf, *eat;
@@ -232,7 +232,11 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
eaf = (__u32 *) (((char *) f) + sizeof(struct ext2_inode) +
extra_isize);
- if (ext2fs_swab32(*eaf) != EXT2_EXT_ATTR_MAGIC)
+ attr_magic = *eaf;
+ if (!hostorder)
+ attr_magic = ext2fs_swab32(attr_magic);
+
+ if (attr_magic != EXT2_EXT_ATTR_MAGIC)
return; /* it seems no magic here */
eat = (__u32 *) (((char *) t) + sizeof(struct ext2_inode) +

13
e2fsprogs-1.40.8-missing_init.patch
View File

@ -1,13 +0,0 @@
Index: e2fsprogs-1.40.8/lib/uuid/gen_uuid.c
===================================================================
--- e2fsprogs-1.40.8.orig/lib/uuid/gen_uuid.c
+++ e2fsprogs-1.40.8/lib/uuid/gen_uuid.c
@@ -316,7 +316,7 @@ static int get_clock(uint32_t *clock_hig
if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
get_random_bytes(&clock_seq, sizeof(clock_seq));
clock_seq &= 0x3FFF;
- last = tv;
+ gettimeofday(&last, 0);
last.tv_sec--;
}

3
e2fsprogs-1.40.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a64b76929772c018618819e17fdf0db7ae4a051562d24eaa25f22909c90dfb5
size 3687806

20
e2fsprogs.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Jun 24 10:07:19 CEST 2008 - mkoenig@suse.de
- update to version 1.40.11
most important changes since 1.40.8:
* Mke2fs will not allow the logically incorect combination of
resize_inode and meta_bg, which had previously caused mke2fs
to create a corrupt fileystem
* Fix mke2fs's creation of resize inode when there is a
non-standard s_first_data_block setting
* Teach fsck to treat "ext4" and "ext4dev" as ext* filesystems
* Fix fsck so that progress information is sent back correctly
* Add detection for ZFS volumes to the libblkid library
- remove e2fsprogs-1.40.7.de.po, updated upstream
- remove patches
e2fsprogs-1.40.7-uuidd_security.patch
e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
e2fsprogs-1.40.8-missing_init.patch
-------------------------------------------------------------------
Wed May 28 00:25:52 CEST 2008 - ro@suse.de

33
e2fsprogs.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package e2fsprogs (Version 1.40.8)
# spec file for package e2fsprogs (Version 1.40.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -19,12 +19,11 @@ Group: System/Filesystems
Supplements: filesystem(ext2) filesystem(ext3)
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.40.8
Release: 19
Version: 1.40.11
Release: 1
Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
Source1: e2fsprogs-1.40.7.de.po
Source2: README.SUSE
Source3: uuidd.rc
Source4: sysconfig.uuidd
@ -35,10 +34,6 @@ Patch1: e2fsprogs-mdraid.patch
Patch2: e2fsprogs-base_devt.patch
Patch3: e2fsprogs-libvolume_id-support.patch
Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch
Patch6: e2fsprogs-1.40.7-uuidd_security.patch
Patch7: e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
Patch8: e2fsprogs-1.40.8-missing_init.patch
Patch9: e2fsprogs-1.40.8-e2fsck_recovery_fix.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
@ -241,10 +236,6 @@ Authors:
%patch2 -p1
%patch3 -p0
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
# libcom_err patches
%patch31 -p1
%patch32 -p1
@ -253,7 +244,6 @@ Authors:
%if %{no_command_hiding}
%patch99 -p1
%endif
cp %{S:1} po/de.po
cp %{SOURCE2} .
%build
@ -451,6 +441,23 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/com_err.3.gz
%changelog
* Tue Jun 24 2008 mkoenig@suse.de
- update to version 1.40.11
most important changes since 1.40.8:
* Mke2fs will not allow the logically incorect combination of
resize_inode and meta_bg, which had previously caused mke2fs
to create a corrupt fileystem
* Fix mke2fs's creation of resize inode when there is a
non-standard s_first_data_block setting
* Teach fsck to treat "ext4" and "ext4dev" as ext* filesystems
* Fix fsck so that progress information is sent back correctly
* Add detection for ZFS volumes to the libblkid library
- remove e2fsprogs-1.40.7.de.po, updated upstream
- remove patches
e2fsprogs-1.40.7-uuidd_security.patch
e2fsprogs-1.40.8-e2fsck_recovery_fix.patch
e2fsprogs-1.40.8-fix_ext2fs_swap_inode_full.patch
e2fsprogs-1.40.8-missing_init.patch
* Wed May 28 2008 ro@suse.de
- fix baselibs.conf to not generate unresolvable deps
* Wed May 21 2008 cthiel@suse.de