From 285b8fe9047e64e0c63239d2b0b8c667936ca176 Mon Sep 17 00:00:00 2001 From: Martin Banky Date: Sat, 18 Sep 2010 19:53:30 -0700 Subject: genext2fs: bump to 1.4.1 Signed-off-by: Martin Banky Signed-off-by: Peter Korsgaard --- CHANGES | 35 +++++++++++----------- package/genext2fs/genext2fs-1.4-nosquash.patch | 14 --------- .../genext2fs-1.4-remove_ugly_warnings.patch | 21 ------------- package/genext2fs/genext2fs-1.4.1-nosquash.patch | 14 +++++++++ .../genext2fs-1.4.1-remove_ugly_warnings.patch | 21 +++++++++++++ package/genext2fs/genext2fs.mk | 2 +- 6 files changed, 54 insertions(+), 53 deletions(-) delete mode 100644 package/genext2fs/genext2fs-1.4-nosquash.patch delete mode 100644 package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch create mode 100644 package/genext2fs/genext2fs-1.4.1-nosquash.patch create mode 100644 package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch diff --git a/CHANGES b/CHANGES index 1f80097a3..c2ab972a2 100644 --- a/CHANGES +++ b/CHANGES @@ -27,23 +27,24 @@ automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa, bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid, docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset, - fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, gperf, - gst-plugins-ugly, gtk2-themes, gtkperf, gvfs, haserl, hdparm, - hostapd, hwdata, ifplugd, imagemagick, iperf, ipsec-tools, - iproute2, iptables, iw, jpeg, kexec, kismet, less, libcgi, - libcurl, libdaemon, libdnet, liberation, libevent, libeXosip2, - libglade, libgtk2, libiconv, libidn, libintl, libmms, libnl, - liboil, libosip2, libpcap, libpng, libtool, libungif, libxml2, - libxslt, lighttpd, lite, lm-sensors, lockfile-progs, - logrotate, m4, mdadm, mesa3d, metacity, mtd-utils, - mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp, - ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openvpn, - oprofile, pango, patch, pcre, php, pkg-config, prboom, radvd, - rdesktop, ruby, qt, quagga, samba, sawman, sdl_mixer, - sdl_sound, setserial, shared-mime-info, speex, sqlite, - squashfs, strace, sylpheed, taglib, tcpdump, thttpd, tiff, - tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun, - which, wpa_supplicant, xapp_twm, xapp_xbacklight, + fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk, + genext2fs, gperf, gst-plugins-ugly, gtk2-themes, gtkperf, + gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, imagemagick, + iperf, ipsec-tools, iproute2, iptables, iw, jpeg, kexec, + kismet, less, libcgi, libcurl, libdaemon, libdnet, liberation, + libevent, libeXosip2, libglade, libgtk2, libiconv, libidn, + libintl, libmms, libnl, liboil, libosip2, libpcap, libpng, + libtool, libungif, libxml2, libxslt, lighttpd, lite, + lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d, + metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon, + netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, + openssh, openvpn, oprofile, pango, patch, pcre, php, + pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba, + sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info, + speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump, + thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils, + vsftpd, vtun, which, wpa_supplicant, xapp_twm, + xapp_xbacklight, xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard}, xdriver-xf86-input-{mouse,synaptics,vmmouse,void}, xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev}, diff --git a/package/genext2fs/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4-nosquash.patch deleted file mode 100644 index 236dfccdf..000000000 --- a/package/genext2fs/genext2fs-1.4-nosquash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c ---- genext2fs-1.4/genext2fs.c 2006-12-19 17:45:31.000000000 +0100 -+++ genext2fs-1.4-nosquash/genext2fs.c 2007-02-09 10:47:05.000000000 +0100 -@@ -1629,10 +1629,6 @@ - mtime = st.st_mtime; - name = dent->d_name; - mode = get_mode(&st); -- if(squash_uids) -- uid = gid = 0; -- if(squash_perms) -- mode &= ~(FM_IRWXG | FM_IRWXO); - if(stats) - switch(st.st_mode & S_IFMT) - { diff --git a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch deleted file mode 100644 index ef23dfbe8..000000000 --- a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c ---- genext2fs-1.4/genext2fs.c 2007-02-09 10:54:56.000000000 +0100 -+++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c 2007-02-09 10:54:30.000000000 +0100 -@@ -1606,7 +1606,7 @@ - static void - add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats) - { -- uint32 nod; -+ uint32 nod = 0; - uint32 uid, gid, mode, ctime, mtime; - const char *name; - FILE *fh; -@@ -2056,7 +2056,7 @@ - static filesystem * - load_fs(FILE * fh, int swapit) - { -- size_t fssize; -+ size_t fssize = 0; - filesystem *fs; - if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1)) - perror_msg_and_die("input filesystem image"); diff --git a/package/genext2fs/genext2fs-1.4.1-nosquash.patch b/package/genext2fs/genext2fs-1.4.1-nosquash.patch new file mode 100644 index 000000000..236dfccdf --- /dev/null +++ b/package/genext2fs/genext2fs-1.4.1-nosquash.patch @@ -0,0 +1,14 @@ +diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c +--- genext2fs-1.4/genext2fs.c 2006-12-19 17:45:31.000000000 +0100 ++++ genext2fs-1.4-nosquash/genext2fs.c 2007-02-09 10:47:05.000000000 +0100 +@@ -1629,10 +1629,6 @@ + mtime = st.st_mtime; + name = dent->d_name; + mode = get_mode(&st); +- if(squash_uids) +- uid = gid = 0; +- if(squash_perms) +- mode &= ~(FM_IRWXG | FM_IRWXO); + if(stats) + switch(st.st_mode & S_IFMT) + { diff --git a/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch new file mode 100644 index 000000000..ef23dfbe8 --- /dev/null +++ b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch @@ -0,0 +1,21 @@ +diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c +--- genext2fs-1.4/genext2fs.c 2007-02-09 10:54:56.000000000 +0100 ++++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c 2007-02-09 10:54:30.000000000 +0100 +@@ -1606,7 +1606,7 @@ + static void + add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats) + { +- uint32 nod; ++ uint32 nod = 0; + uint32 uid, gid, mode, ctime, mtime; + const char *name; + FILE *fh; +@@ -2056,7 +2056,7 @@ + static filesystem * + load_fs(FILE * fh, int swapit) + { +- size_t fssize; ++ size_t fssize = 0; + filesystem *fs; + if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1)) + perror_msg_and_die("input filesystem image"); diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk index 8c4981edb..b4a8e70c8 100644 --- a/package/genext2fs/genext2fs.mk +++ b/package/genext2fs/genext2fs.mk @@ -4,7 +4,7 @@ # ############################################################# -GENEXT2FS_VERSION=1.4 +GENEXT2FS_VERSION=1.4.1 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs -- cgit v1.2.3