August 2022 - openSUSE Commits - openSUSE Mailing Lists

commit crmsh for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2022-08-30 14:50:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Tue Aug 30 14:50:39 2022 rev:254 rq:1000191 version:4.4.1+20220830.5a63c85f Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-23 14:30:17.807694134 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes 2022-08-30 14:51:24.196414872 +0200 @@ -1,0 +2,22 @@ +Tue Aug 30 08:19:38 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20220830.5a63c85f: + * Dev: unittest: Adjust unit test based on previous changes + * Dev: bootstrap: Show remote node name when stopping service remotely + +------------------------------------------------------------------- +Mon Aug 29 07:35:53 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20220829.08a730cb: + * Dev: log: print a full-width progress bar in status_progress to prevent interleaving with log messages + * Dev: log: print begin and end marker in different lines in status_long + +------------------------------------------------------------------- +Wed Aug 24 09:20:14 UTC 2022 - XLiang(a)suse.com + +- Update to version 4.4.1+20220824.c59544bf: + * Dev: ui_context: remove duplicated codes + * Dev: parallax: Add LogLevel=error ssh option to filter out warnings (bsc#1196726) + * Revert "Fix: utils: Only raise exception when return code of systemctl command over ssh larger than 4 (bsc#1196726)" (bsc#1202655) + +------------------------------------------------------------------- Old: ---- crmsh-4.4.1+20220822.c2f5d204.tar.bz2 New: ---- crmsh-4.4.1+20220830.5a63c85f.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.JV6RKf/_old 2022-08-30 14:51:24.832416494 +0200 +++ /var/tmp/diff_new_pack.JV6RKf/_new 2022-08-30 14:51:24.840416515 +0200 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 4.4.1+20220822.c2f5d204 +Version: 4.4.1+20220830.5a63c85f Release: 0 URL: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.JV6RKf/_old 2022-08-30 14:51:24.892416648 +0200 +++ /var/tmp/diff_new_pack.JV6RKf/_new 2022-08-30 14:51:24.896416658 +0200 @@ -9,7 +9,7 @@ </service> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">1be81833f51a3d83b3329085cec5ab19f1957ef4</param> + <param name="changesrevision">5a63c85f3d0e2e2d1bb3407fb4de7e0b4e9a8144</param> </service> </servicedata> (No newline at EOF) ++++++ crmsh-4.4.1+20220822.c2f5d204.tar.bz2 -> crmsh-4.4.1+20220830.5a63c85f.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/bootstrap.py new/crmsh-4.4.1+20220830.5a63c85f/crmsh/bootstrap.py --- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/bootstrap.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/bootstrap.py 2022-08-30 10:02:28.000000000 +0200 @@ -361,20 +361,20 @@ """ Wait for resource started """ - with logger_utils.status_long(message): + with logger_utils.status_long(message) as progress_bar: while True: if xmlutil.CrmMonXmlParser.is_resource_started(resource): break - status_progress() + status_progress(progress_bar) sleep(1) def wait_for_cluster(): - with logger_utils.status_long("Waiting for cluster"): + with logger_utils.status_long("Waiting for cluster") as progress_bar: while True: if is_online(): break - status_progress() + status_progress(progress_bar) sleep(2) @@ -438,10 +438,9 @@ time.sleep(t) -def status_progress(): +def status_progress(progress_bar): if not _context or not _context.quiet: - sys.stdout.write(".") - sys.stdout.flush() + progress_bar.progress() def partprobe(): @@ -1873,7 +1872,7 @@ """ for service in stop_list: if utils.service_is_active(service, remote_addr=remote_addr): - logger.info("Stopping the {}".format(service)) + logger.info("Stopping the %s%s", service, " on {}".format(remote_addr) if remote_addr else "") utils.stop_service(service, disable=True, remote_addr=remote_addr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/log.py new/crmsh-4.4.1+20220830.5a63c85f/crmsh/log.py --- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/log.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/log.py 2022-08-30 10:02:28.000000000 +0200 @@ -46,14 +46,11 @@ "ERROR": constants.RED } FORMAT = "%(levelname)s: %(message)s" - FORMAT_RAW = "%(message)s" - def __init__(self, lineno=-1, raw_msg=False, fmt=None): + def __init__(self, lineno=-1, fmt=None): self.lineno = lineno if fmt: super().__init__(fmt=fmt) - elif raw_msg: - super().__init__(fmt=self.FORMAT_RAW) else: super().__init__(fmt=self.FORMAT) @@ -246,18 +243,6 @@ console_handler.terminator = "\n" @contextmanager - def raw_msg(self): - """ - Only print raw message, without levelname - """ - console_handler = self.get_handler("console") - try: - console_handler.setFormatter(ConsoleCustomFormatter(raw_msg=True)) - yield - finally: - console_handler.setFormatter(ConsoleCustomFormatter()) - - @contextmanager def only_file(self): """ Only log to file in bootstrap logger @@ -311,27 +296,19 @@ finally: self.reset_lineno(self.__save_lineno) - def status_done(self): - """ - Log info message "done" in console - """ - with self.raw_msg(): - self.logger.info("done") - @contextmanager def status_long(self, msg): """ - To wait and mark something finished, start with msg, end of done + To wait and mark something finished, start with BEGIN msg, end of END msg """ - with self.suppress_new_line(): - self.logger.info("%s...", msg) + self.logger.info("BEGIN %s", msg) try: - yield - except: - print("") + yield ProgressBar() + except Exception: + self.logger.error("FAIL %s", msg) raise else: - self.status_done() + self.logger.info("END %s", msg) def wait_input(self, prompt_string, default=""): """ @@ -423,6 +400,22 @@ self.logger.info("offending xml: %s", xml) +class ProgressBar: + def __init__(self): + self._i = 0 + + def progress(self): + try: + width, _ = os.get_terminal_size() + except OSError: + # not a terminal + return + self._i = (self._i + 1) % width + line = '\r{}{}'.format('.' * self._i, ' ' * (width - self._i)) + sys.stdout.write(line) + sys.stdout.flush() + + def setup_directory_for_logfile(): """ Create log file's parent directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/parallax.py new/crmsh-4.4.1+20220830.5a63c85f/crmsh/parallax.py --- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/parallax.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/parallax.py 2022-08-30 10:02:28.000000000 +0200 @@ -37,7 +37,9 @@ def prepare(self): opts = parallax.Options() if self.ssh_options is None: - self.ssh_options = ['StrictHostKeyChecking=no', 'ConnectTimeout=10'] + self.ssh_options = ['StrictHostKeyChecking=no', + 'ConnectTimeout=10', + 'LogLevel=error'] opts.ssh_options = self.ssh_options opts.askpass = self.askpass # warn_message will available from parallax-1.0.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_context.py new/crmsh-4.4.1+20220830.5a63c85f/crmsh/ui_context.py --- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_context.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/ui_context.py 2022-08-30 10:02:28.000000000 +0200 @@ -90,14 +90,7 @@ break if cmd: rv = self.execute_command() is not False - except ValueError as msg: - if config.core.debug or options.regression_tests: - import traceback - traceback.print_exc() - sys.stdout.flush() - logger.error("%s: %s", self.get_qualified_name(), msg) - rv = False - except IOError as msg: + except (ValueError, IOError) as msg: if config.core.debug or options.regression_tests: import traceback traceback.print_exc() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/utils.py new/crmsh-4.4.1+20220830.5a63c85f/crmsh/utils.py --- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/utils.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/utils.py 2022-08-30 10:02:28.000000000 +0200 @@ -2539,13 +2539,10 @@ elif self.remote_addr and self.remote_addr != this_node(): prompt_msg = "Run \"{}\" on {}".format(cmd, self.remote_addr) rc, output, err = run_cmd_on_remote(cmd, self.remote_addr, prompt_msg) - # see "EXIT STATUS" in man systemctl - if rc > 4: - raise ValueError("Run \"{}\" error: {}".format(cmd, err)) else: rc, output, err = get_stdout_stderr(cmd) - if rc != 0 and err: - raise ValueError("Run \"{}\" error: {}".format(cmd, err)) + if rc != 0 and err: + raise ValueError("Run \"{}\" error: {}".format(cmd, err)) return rc == 0, output @property diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/test/unittests/test_bootstrap.py new/crmsh-4.4.1+20220830.5a63c85f/test/unittests/test_bootstrap.py --- old/crmsh-4.4.1+20220822.c2f5d204/test/unittests/test_bootstrap.py 2022-08-22 07:51:44.000000000 +0200 +++ new/crmsh-4.4.1+20220830.5a63c85f/test/unittests/test_bootstrap.py 2022-08-30 10:02:28.000000000 +0200 @@ -1359,10 +1359,10 @@ mock.call("csync2.socket", remote_addr=None) ]) mock_status.assert_has_calls([ - mock.call("Stopping the corosync-qdevice.service"), - mock.call("Stopping the corosync.service"), - mock.call("Stopping the hawk.service"), - mock.call("Stopping the csync2.socket") + mock.call('Stopping the %s%s', 'corosync-qdevice.service', ''), + mock.call('Stopping the %s%s', 'corosync.service', ''), + mock.call('Stopping the %s%s', 'hawk.service', ''), + mock.call('Stopping the %s%s', 'csync2.socket', '') ]) mock_stop.assert_has_calls([ mock.call("corosync-qdevice.service", disable=True, remote_addr=None),

1 0

commit genromfs for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package genromfs for openSUSE:Factory checked in at 2022-08-30 14:50:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/genromfs (Old) and /work/SRC/openSUSE:Factory/.genromfs.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "genromfs" Tue Aug 30 14:50:38 2022 rev:20 rq:1000180 version:0.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/genromfs/genromfs.changes 2022-05-14 22:58:52.127493839 +0200 +++ /work/SRC/openSUSE:Factory/.genromfs.new.2083/genromfs.changes 2022-08-30 14:51:23.448412963 +0200 @@ -1,0 +2,10 @@ +Sat Aug 27 11:52:39 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 0.5.7 + * Make extension options really able to copy the current data. + * Detect unparseable numbers in the extended options. + * Tags were stored in an incorrect order, making any value of + uids, gids and timestamps larger than 4095 ending up with a + wrong value. + +------------------------------------------------------------------- Old: ---- genromfs-0.5.2.tar.gz New: ---- 0.5.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genromfs.spec ++++++ --- /var/tmp/diff_new_pack.rkXEa6/_old 2022-08-30 14:51:23.832413943 +0200 +++ /var/tmp/diff_new_pack.rkXEa6/_new 2022-08-30 14:51:23.836413953 +0200 @@ -17,14 +17,13 @@ Name: genromfs -Version: 0.5.2 +Version: 0.5.7 Release: 0 Summary: Utility for Creating romfs File Systems License: GPL-2.0-or-later Group: System/Boot URL: http://romfs.sourceforge.net -Source: https://downloads.sf.net/romfs/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: https://github.com/chexum/genromfs/archive/refs/tags/%version.tar.gz %description Genromfs is a tool for creating romfs file systems, which are @@ -33,17 +32,17 @@ used during installation. %prep -%setup -q +%autosetup %build -make %{?_smp_mflags} CC="gcc" CFLAGS="%{optflags} -DVERSION=\\\"%{version}\\\"" LDFLAGS= +%make_build CC="gcc" CFLAGS="%{optflags} -DVERSION=\\\"%{version}\\\"" LDFLAGS= %install -make PREFIX=%{buildroot} mandir=%{_mandir} install +%make_install PREFIX="%{buildroot}" mandir="%{_mandir}" %files -%defattr(-,root,root) -%doc COPYING NEWS ChangeLog genromfs.lsm romfs.txt +%license COPYING +%doc NEWS ChangeLog genromfs.lsm romfs.txt %doc %{_mandir}/man8/genromfs.8.gz %{_bindir}/genromfs ++++++ genromfs-0.5.2.tar.gz -> 0.5.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/.gitignore new/genromfs-0.5.7/.gitignore --- old/genromfs-0.5.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/.gitignore 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,4 @@ +selftest/*.out +selftest/*.bin +genromfs +genromfs.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/ChangeLog new/genromfs-0.5.7/ChangeLog --- old/genromfs-0.5.2/ChangeLog 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/ChangeLog 2009-02-15 11:48:15.000000000 +0100 @@ -1,3 +1,8 @@ +2009-02-15 11:43 Janos Farkas <chexum(a)shadow.banki.hu> + + * Many changes, the main feature is to support + unixy file metadata on request. Test release 0.5.7. + 2007-06-26 19:04 Janos Farkas <chexum+dev () gmail.com> * NEWS, genromfs.8, genromfs.lsm: releasing 0.5.2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/Makefile new/genromfs-0.5.7/Makefile --- old/genromfs-0.5.2/Makefile 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/Makefile 2009-02-15 11:48:15.000000000 +0100 @@ -4,7 +4,7 @@ all: genromfs PACKAGE = genromfs -VERSION = 0.5.2 +VERSION = 0.5.7 CC = gcc CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# LDFLAGS = -s#-g @@ -14,7 +14,8 @@ FILES = COPYING NEWS ChangeLog Makefile \ genromfs.8 genromfs.c genromfs.lsm \ readme-kernel-patch genrommkdev romfs.txt \ - checkdist + checkdist \ + .gitignore selftest prefix = /usr bindir = $(prefix)/bin @@ -37,11 +38,14 @@ rm -rf $(DISTDIR).tar.gz $(DISTDIR) mkdir $(DISTDIR); for i in $(FILES); do \ - cp $$i $(DISTDIR)/; \ + cp -r $$i $(DISTDIR)/; \ done; \ tar --owner=root --group=root -zcf $(DISTDIR).tar.gz $(DISTDIR); rm -rf $(DISTDIR) +check: all selftest + $(MAKE) -C selftest dotest + install: all install-bin install-man install-bin: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/NEWS new/genromfs-0.5.7/NEWS --- old/genromfs-0.5.2/NEWS 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/NEWS 2009-02-15 11:48:15.000000000 +0100 @@ -1,3 +1,15 @@ +Changes in (pre)release 0.5.7: + +* A test suite is now included (but may not work correctly in all + circumstances). +* Implemented including files by pattern, and combining this with excludes +* It is now possible to override alignment with a smaller value: + genromfs -A2048,*.boot -A1024,m68k.boot -A512,m68k.boot +* Unix permissions, including mode bits, user and group id, and even + mtime may be saved for individual files. This needs a format change, + which is backward compatible, but older kernels will not recognise + any of these features. + Changes in release 0.5.2: * faked device names may contain the special characters "-" "_" and "+" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/genromfs.8 new/genromfs-0.5.7/genromfs.8 --- old/genromfs-0.5.2/genromfs.8 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/genromfs.8 2009-02-15 11:48:15.000000000 +0100 @@ -1,4 +1,4 @@ -.TH GENROMFS 8 "Jun 2007" "Version 0.5.2" +.TH GENROMFS 8 "Feb 2009" "Version 0.5.7" .SH NAME genromfs \- create a romfs image .SH SYNOPSIS @@ -83,16 +83,99 @@ directories, or start with a leading slash, in which case they are matched against absolute paths inside of the romfs filesystem (that is, as if you chrooted into the rom filesystem). + .TP .BI -x \ pattern Allow to exclude files that match a pattern. It's useful to exclude CVS directories and backup files (ending in a '~'). .TP +.BI -i \ pattern +Include files that match a pattern. You can mix and match +.B +-i +and +.B +-x +options, they will be processed in the order specified. You can exclude +files matching +.I +*.bin +but include +.I +boot*.bin +later. +.TP .BI -v Verbose operation, .B genromfs will print each file which is included in the image, along with its offset. + +.SH EXTENSION OPTIONS +Except for the alignment options, these are not supported in current +in-kernel +.B +romfs +implementations as of early 2009. + +.TP +.BI -ealign:N,PATTERN +Same as the +.B -AN,PATTERN +option. + +.TP +.BI -ealign:N +Same as the +.B -aN +option. + +.TP +.BI -eperm:N[,PATTERN] +Will try to store the numeric (octal) permission for the files matching the pattern. Examples are +.B +600 +for files accessible to their owners only, or +.B +4711 +for +.I +setuid +files. +The +.I +PATTERN +is optional, if missing, it will apply to all files (which is not generally useful). + +.TP +.BI -eperm[,PATTERN] +Similar to the above option, except that the permission to store will be retrieved from the +actual file. + +.TP +.BI -euid:N[,PATTERN] + +.TP +.BI -euid[,PATTERN] + +.TP +.BI -egid:N[,PATTERN] + +.TP +.BI -egid[,PATTERN] +Similarly to the +.I +-eperm +option, these options allow to store the file user-id and group-id information. + +.TP +.BI -etime:N[,PATTERN] + +.TP +.BI -etime[,PATTERN] +Similarly, these options allow to store the file modification timestamp. The number is the +Unix time, the seconds since January 1, 1970, 00:00:00 UTC. + .SH EXAMPLES .EX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/genromfs.c new/genromfs-0.5.7/genromfs.c --- old/genromfs-0.5.2/genromfs.c 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/genromfs.c 2009-02-15 11:48:15.000000000 +0100 @@ -75,7 +75,15 @@ #include <sys/sysmacros.h> #endif +#ifdef O_BINARY +#define O_RDBIN (O_RDONLY|O_BINARY) +#else +#define O_RDBIN O_RDONLY +#endif + +/* physical on-disk layout */ +/* 16 byte romfs header */ struct romfh { int32_t nextfh; int32_t spec; @@ -94,6 +102,39 @@ #define ROMFH_FIF 7 #define ROMFH_EXEC 8 +#define ROMEXT_MAGIC3 "xyz" + +/* + * extension tag, starting backwards from the fileheader: + * .... + * TtTt TtTt TtTt TtTt + * TtTt TtTt xyzN CHKS + * NEXT SPEC SIZE CHKS <- the usual fileheader + * Tt: 16 bits of romext tags, the first few being 0 + * xyzN: 16 bits of ID, N being the (binary) number of 16 byte "rows" + * CHKS: checksum spanning the whole + */ + +#define ROMET_TYPE 0xf000 /* type of the tag */ +#define ROMET_VAL 0x0fff /* value of the tag */ + +/* reserved for extended attributes */ +#define ROMET_MORE 0x0000 /* 6+6 bits of further extensions */ + +#define ROMET_MORETYPE 0x0fc0 /* 6 bits - additional extension type */ +#define ROMETMT_END 0x0000 /* end of extension tags */ +#define ROMET_MOREVAL 0x003f /* 6 bits - number of int16s */ + +#define ROMET_PERM 0x1000 /* 12 bits of permissions AND end of tags */ +#define ROMET_UGID 0x2000 /* 6+6 bits of uid/gid */ +#define ROMET_UID 0x3000 /* 12 additional bits of uid (ROLed in) */ +#define ROMET_GID 0x4000 /* 12 additional bits of gid (ROLed in) */ +#define ROMET_TIME 0x5000 /* 12 additional bits of timestamp (ROLed in) */ +#define ROMET_MARKER 0x7000 /* ignored -- header only */ +/* 0x6000/0x8000-0xf000 is reserved */ + +/* genromfs internal data types */ + struct filenode; struct filehdr { @@ -115,23 +156,39 @@ struct filenode *orig_link; char *name; char *realname; + int isrootdot; dev_t ondev; dev_t devnode; ino_t onino; mode_t modes; + uid_t nuid; + gid_t ngid; + time_t ntime; unsigned int offset; - unsigned int size; - unsigned int pad; + unsigned int realsize; + unsigned int prepad; + unsigned int postpad; + int exclude; + unsigned int align; + int extperm; + int extuid; + int extgid; + int exttime; + char extdata[32]; + int extlen; }; -struct aligns { - struct aligns *next; - int align; - char pattern[0]; -}; - -struct excludes { - struct excludes *next; +#define EXTTYPE_UNKNOWN 0 +#define EXTTYPE_ALIGNMENT 1 +#define EXTTYPE_EXCLUDE 2 +#define EXTTYPE_EXTPERM 3 +#define EXTTYPE_EXTUID 4 +#define EXTTYPE_EXTGID 5 +#define EXTTYPE_EXTTIME 6 +struct extmatches { + struct extmatches *next; + unsigned int exttype; + unsigned int num; char pattern[0]; }; @@ -162,7 +219,7 @@ struct filenode *p; fprintf(f, "%-4d %-20s [0x%-8x, 0x%-8x] %07o, sz %5u, at 0x%-6x", level, node->name, - (int)node->ondev, (int)node->onino, node->modes, node->size, + (int)node->ondev, (int)node->onino, node->modes, node->realsize, node->offset); if (node->orig_link) @@ -181,37 +238,43 @@ static char bigbuf[4096]; static char fixbuf[512]; static int atoffs = 0; -static int align = 16; -struct aligns *alignlist = NULL; -struct excludes *excludelist = NULL; -int realbase; +static struct extmatches *patterns = NULL; +static int realbase; +static int extlevel = 0; + +#define DEFALIGN 16 /* helper function to match an exclusion or align pattern */ int nodematch(char *pattern, struct filenode *node) { char *start = node->name; + + /* empty means all */ + if (pattern[0] == 0) return 0; + /* XXX: ugly realbase is global */ if (pattern[0] == '/') start = node->realname + realbase; return fnmatch(pattern,start,FNM_PATHNAME|FNM_PERIOD); } -int findalign(struct filenode *node) +void addpattern(int type,int num,char *s) { - struct aligns *pa; - int i; - - if (S_ISREG(node->modes)) i = align; - else i = 16; - - for (pa = alignlist; pa; pa = pa->next) { - if (pa->align > i) { - if (!nodematch(pa->pattern,node)) i = pa->align; + struct extmatches *pa, *pa2; + pa = (struct extmatches *)malloc(sizeof(*pa) + strlen(s) + 1); + pa->exttype = type; + pa->num = num; + pa->next = NULL; + strcpy (pa->pattern,s); + + if (!patterns) { patterns = pa; } + else { + for (pa2 = patterns; pa2->next; pa2 = pa2->next) { + ; } + pa2->next = pa; } - return i; } - int romfs_checksum(void *data, int size) { int32_t sum, word, *ptr; @@ -291,6 +354,11 @@ memset(bigbuf+16+len, 0, 16-(len&15)); len += 16-(len&15); } + /* special marker for present extensions */ + if (n->isrootdot == 1 && extlevel) { + memcpy(bigbuf+16+8, ROMEXT_MAGIC3, 3); + fixsum((struct romfh *)(bigbuf + 16), 16); + } len+=16; ri=(struct romfh *)bigbuf; if (n->offset) @@ -310,12 +378,17 @@ struct romfh ri; struct filenode *p; + if (node->prepad) + dumpzero(node->prepad, f); + if (node->extlen) { + dumpdataa(node->extdata+sizeof(node->extdata)-node->extlen, node->extlen, f); + } + ri.nextfh = 0; ri.spec = 0; - ri.size = htonl(node->size); + ri.size = htonl(node->realsize); ri.checksum = htonl(0x55555555); - if (node->pad) - dumpzero(node->pad, f); + if (node->next && node->next->next) ri.nextfh = htonl(node->next->offset); if ((node->modes & 0111) && @@ -340,21 +413,19 @@ ri.nextfh |= htonl(ROMFH_LNK); dumpri(&ri, node, f); memset(bigbuf, 0, sizeof(bigbuf)); - readlink(node->realname, bigbuf, node->size); - dumpdataa(bigbuf, node->size, f); + readlink(node->realname, bigbuf, node->realsize); + dumpdataa(bigbuf, node->realsize, f); } else if (S_ISREG(node->modes)) { int offset, len, fd, max, avail; ri.nextfh |= htonl(ROMFH_REG); dumpri(&ri, node, f); offset = 0; - max = node->size; - /* XXX warn about size mismatch */ - fd = open(node->realname, O_RDONLY -#ifdef O_BINARY -| O_BINARY -#endif -); + max = node->realsize; + fd = open(node->realname, O_RDBIN); if (fd) { + /* we cannot handle 64 bit file sizes */ + unsigned int realsize=0; + struct stat s; while(offset < max) { avail = max-offset < sizeof(bigbuf) ? max-offset : sizeof(bigbuf); len = read(fd, bigbuf, avail); @@ -363,7 +434,26 @@ dumpdata(bigbuf, len, f); offset+=len; } + if (offset != max) { + fprintf(stderr,"file %s changed size while reading?\n",node->realname); + exit(1); + } + if (!fstat(fd,&s)) { + realsize = s.st_size; + } + if (realsize != max) { + fprintf(stderr,"file %s changed size while reading?\n",node->realname); + exit(1); + } + realsize = lseek(fd,0,SEEK_CUR); + if (realsize != max) { + fprintf(stderr,"file %s changed size while reading?\n",node->realname); + exit(1); + } close(fd); + } else { + fprintf(stderr,"file %s cannot be opened?\n",node->realname); + exit(1); } max = (max+15)&~15; while (offset < max) { @@ -387,6 +477,8 @@ ri.nextfh |= htonl(ROMFH_SCK); dumpri(&ri, node, f); } + if (node->postpad) + dumpzero(node->postpad, f); p = node->dirlist.head; while (p->next) { @@ -422,11 +514,19 @@ /* Rare, not yet */ } -void setnode(struct filenode *n, dev_t dev, ino_t ino, mode_t um) +void setnode(struct filenode *n, struct stat *sb) { - n->ondev = dev; - n->onino = ino; - n->modes = um; + n->ondev = sb->st_dev; + n->onino = sb->st_ino; + n->modes = sb->st_mode; + n->nuid = sb->st_uid; + n->ngid = sb->st_gid; + n->ntime = sb->st_mtime; + n->realsize = 0; + /* only regular files and symlinks contain "data" in romfs */ + if (S_ISREG(n->modes) || S_ISLNK(n->modes)) { + n->realsize = sb->st_size; + } } struct filenode *newnode(const char *base, const char *name, int curroffset) @@ -440,6 +540,7 @@ fprintf(stderr,"out of memory\n"); exit(1); } + memset(node,0,sizeof(*node)); len = strlen(name); str = malloc(len+1); @@ -468,18 +569,21 @@ } node->realname = str; - node->next = node->prev = NULL; - node->parent = NULL; initlist(&node->dirlist, node); node->ondev = -1; node->onino = -1; node->modes = -1; - node->size = 0; - node->devnode = 0; - node->orig_link = NULL; node->offset = curroffset; - node->pad = 0; + node->align = DEFALIGN; + + /* -2: specified without value */ + /* -1: specified as blank (to copy original) */ + /* N: specified */ + node->extperm = -2; + node->extuid = -2; + node->extgid = -2; + node->exttime = -2; return node; } @@ -503,23 +607,153 @@ #define ALIGNUP16(x) (((x)+15)&~15) -int spaceneeded(struct filenode *node) +int spaceneeded(struct filenode *node, unsigned int sz) { - return 16 + ALIGNUP16(strlen(node->name)+1) + ALIGNUP16(node->size); + return 16 + ALIGNUP16(strlen(node->name)+1) + ALIGNUP16(sz); } int alignnode(struct filenode *node, int curroffset, int extraspace) { - int align = findalign(node), d; - + int d; + unsigned int align = DEFALIGN; + unsigned int checkpos; + int fd; + + if (S_ISREG(node->modes)) align = node->align; + + /* Just a safeguard to make sure file contents won't be mistaken for extension tags */ + if ((checkpos = node->realsize) && + (((checkpos+8) & 15) <= 8)) { + if ((((checkpos+8)&15) == 8)) checkpos -= 16; + checkpos &= ~15; + + if (S_ISREG(node->modes)) { + if ((fd = open(node->realname, O_RDBIN)) >= 0) { + memset(bigbuf, 0, 16); + read(fd, bigbuf, 16); + checkpos = 0; + } + } else if (S_ISLNK(node->modes)) { + memset(bigbuf, 0, sizeof(bigbuf)); + readlink(node->realname, bigbuf, sizeof(bigbuf)-1); + } else { + fprintf(stderr,"internal error, %s has size?\n", node->realname); + exit(1); + } + if(!memcmp(bigbuf+checkpos+8, ROMEXT_MAGIC3, 3)) { + node->postpad += 16; + } + } + + curroffset += node->extlen; + node->offset += node->extlen; + d = ((curroffset + extraspace) & (align - 1)); if (d) { align -= d; curroffset += align; node->offset += align; - node->pad = align; + node->prepad = align; } - return curroffset; + + return curroffset+node->postpad; +} + +/* Build romfs extension header */ +/* NOTE: The format change is not complete */ +/* XXX: root permissions must be stored in /.. */ + +int buildromext(struct filenode *node) +{ + unsigned int tag; + unsigned int extidx,extend; + char *romext=node->extdata; + unsigned int myuid,mygid; + unsigned int mytime; + + /* root dir cannot be extended */ + if (node->isrootdot == 1) return 0; + + extend = extidx = sizeof(node->extdata); + memset(romext, 0, extidx); + + extidx-=8; + memcpy(romext+extidx,ROMEXT_MAGIC3,3); + + /* override permissions if any given */ + if (node->extperm != (unsigned int)-1 && node->extperm != (unsigned int)-2) { + node->modes = (node->modes&~07777)|node->extperm; + } + if (node->extuid != (unsigned int)-1 && node->extuid != (unsigned int)-2) { + node->nuid = node->extuid; + } + if (node->extgid != (unsigned int)-1 && node->extgid != (unsigned int)-2) { + node->ngid = node->extgid; + } + if (node->exttime != (unsigned int)-1 && node->exttime != (unsigned int)-2) { + node->ntime = node->exttime; + } else { + node->ntime = 0; + } + + /* build romext */ + if (node->extperm != (unsigned int)-2) { + tag=ROMET_PERM|(node->modes&07777); + romext[--extidx]=tag; + romext[--extidx]=tag>>8; + } + myuid = node->nuid; + mygid = node->ngid; + if (node->extuid == (unsigned int)-2) { myuid = 0; } + if (node->extgid == (unsigned int)-2) { mygid = 0; } + if ((myuid && mygid) && + ( (myuid <= 077 && mygid <= 077)) ) { + tag=ROMET_UGID|((myuid&077)<<6|(mygid&077)); + romext[--extidx]=tag; + romext[--extidx]=tag>>8; + myuid >>= 6; + mygid >>= 6; + } + while (myuid) { + tag=ROMET_UID|(myuid&0xfff); + romext[--extidx]=tag; + romext[--extidx]=tag>>8; + myuid >>= 12; + } + while (mygid) { + tag=ROMET_GID|(mygid&0xfff); + romext[--extidx]=tag; + romext[--extidx]=tag>>8; + mygid >>= 12; + } + mytime = node->ntime; + while (mytime) { + tag=ROMET_TIME|(mytime&0xfff); + romext[--extidx]=tag; + romext[--extidx]=tag>>8; + mytime >>= 12; + } + + + if (extidx == (extend-8)) { + return 0; + } + + /* compute the aligned start */ + extidx &= ~15; + node->extlen = extend-extidx; + tag = htonl(-romfs_checksum(node->extdata+extidx, node->extlen)); + /* the number of 16 byte lines in the extension header */ + node->extdata[extend-5] = node->extlen>>4; + + /* store checksum */ + romext = node->extdata + extend; + *--romext=tag; + *--romext=tag>>8; + *--romext=tag>>16; + *--romext=tag>>24; + + return node->extlen; } int processdir(int level, const char *base, const char *dirname, struct stat *sb, @@ -528,31 +762,34 @@ DIR *dirfd; struct dirent *dp; struct filenode *n, *link; - struct excludes *pe; + struct extmatches *pa; + /* To make sure . and .. are handled correctly in the + * root directory, we add them first. Note also that we + * alloc them first to get to know the real name + */ if (level <= 1) { - /* Ok, to make sure . and .. are handled correctly - * we add them first. Note also that we alloc them - * first to get to know the real name - */ link = newnode(base, ".", curroffset); + link->isrootdot = 1; if (!lstat(link->realname, sb)) { - setnode(link, sb->st_dev, sb->st_ino, sb->st_mode); + setnode(link, sb); append(&dir->dirlist, link); - /* special case for root node - '..'s in subdirs should link to - * '.' of root node, not root node itself. + /* special case for root node - '..'s in + * subdirs should link to '.' of root + * node, not root node itself. */ dir->dirlist.owner = link; - curroffset = alignnode(link, curroffset, 0) + spaceneeded(link); + curroffset = alignnode(link, curroffset, 0) + spaceneeded(link,0); n = newnode(base, "..", curroffset); + n->isrootdot = 2; if (!lstat(n->realname, sb)) { - setnode(n, sb->st_dev, sb->st_ino, sb->st_mode); + setnode(n, sb); append(&dir->dirlist, n); n->orig_link = link; - curroffset = alignnode(n, curroffset, 0) + spaceneeded(n); + curroffset = alignnode(n, curroffset, 0) + spaceneeded(n,0); } } } @@ -569,11 +806,18 @@ continue; n = newnode(base, dp->d_name, curroffset); - /* Process exclude list. */ - for (pe = excludelist; pe; pe = pe->next) { - if (!nodematch(pe->pattern, n)) { freenode(n); break; } + /* Process exclude/align list. */ + for (pa = patterns; pa; pa = pa->next) { + if (!nodematch(pa->pattern, n)) { + if (pa->exttype == EXTTYPE_EXCLUDE) { n->exclude = pa->num; } + if (pa->exttype == EXTTYPE_ALIGNMENT) { n->align = pa->num; } + if (pa->exttype == EXTTYPE_EXTPERM) { extlevel |= 1; n->extperm = pa->num; } + if (pa->exttype == EXTTYPE_EXTUID) { extlevel |= 1; n->extuid = pa->num; } + if (pa->exttype == EXTTYPE_EXTGID) { extlevel |= 1; n->extgid = pa->num; } + if (pa->exttype == EXTTYPE_EXTTIME) { extlevel |= 1; n->exttime = pa->num; } + } } - if (pe) continue; + if (n->exclude) { freenode(n); continue; } if (lstat(n->realname, sb)) { fprintf(stderr, "ignoring '%s' (lstat failed)\n", n->realname); @@ -602,7 +846,7 @@ char type; int major; int minor; - + if (sscanf(n->name, "@%[a-zA-Z0-9_+-],%c,%d,%d", devname, &type, &major, &minor) == 4 ) { strcpy(n->name, devname); @@ -629,7 +873,7 @@ } } - setnode(n, sb->st_dev, sb->st_ino, sb->st_mode); + setnode(n, sb); /* Skip unreadable files/dirs */ if (!S_ISLNK(n->modes) && access(n->realname, R_OK)) { fprintf(stderr, "ignoring '%s' (access failed)\n", n->realname); @@ -649,23 +893,26 @@ } if (link) { + n->realsize = 0; n->orig_link = link; - curroffset = alignnode(n, curroffset, 0) + spaceneeded(n); + curroffset = alignnode(n, curroffset, 0) + spaceneeded(n,0); continue; } - if (S_ISREG(sb->st_mode)) { - curroffset = alignnode(n, curroffset, spaceneeded(n)); - n->size = sb->st_size; - } else - curroffset = alignnode(n, curroffset, 0); - if (S_ISLNK(sb->st_mode)) { - n->size = sb->st_size; - } - curroffset += spaceneeded(n); + if (S_ISCHR(sb->st_mode) || S_ISBLK(sb->st_mode)) { n->devnode = sb->st_rdev; } + buildromext(n); + + if (S_ISREG(sb->st_mode)) { + curroffset = alignnode(n, curroffset, spaceneeded(n,0)); + } else { + curroffset = alignnode(n, curroffset, 0); + } + + curroffset += spaceneeded(n,n->realsize); + if (S_ISDIR(sb->st_mode)) { if (!strcmp(n->name, "..")) { curroffset = processdir(level+1, dir->realname, dp->d_name, @@ -693,9 +940,10 @@ printf(" -a ALIGN Align regular file data to ALIGN bytes\n"); printf(" -A ALIGN,PATTERN Align all objects matching pattern to at least ALIGN bytes\n"); printf(" -x PATTERN Exclude all objects matching pattern\n"); + printf(" -i PATTERN Include all objects matching pattern\n"); printf(" -h Show this help\n"); printf("\n"); - printf("Report bugs to chexum(a)shadow.banki.hu\n"); + printf("To report bugs check http://romfs.sf.net/\n"); } int main(int argc, char *argv[]) @@ -709,13 +957,11 @@ struct filenode *root; struct stat sb; int lastoff; - int i; - char *p; - struct aligns *pa, *pa2; - struct excludes *pe, *pe2; + unsigned int i; + char *p,*optn,*optpat; FILE *f; - while ((c = getopt(argc, argv, "V:vd:f:ha:A:x:")) != EOF) { + while ((c = getopt(argc, argv, "V:vd:f:ha:A:x:i:e:")) != EOF) { switch(c) { case 'd': dir = optarg; @@ -733,45 +979,81 @@ showhelp(argv[0]); exit(0); case 'a': - align = strtoul(optarg, NULL, 0); - if (align < 16 || (align & (align - 1))) { - fprintf(stderr, "Align has to be at least 16 bytes and a power of two\n"); - exit(1); - } - break; case 'A': i = strtoul(optarg, &p, 0); if (i < 16 || (i & (i - 1))) { - fprintf(stderr, "Align has to be at least 16 bytes and a power of two\n"); + fprintf(stderr, "Alignment has to be at least 16 bytes and a power of two\n"); exit(1); } - if (*p != ',' || !p[1]) { + if (c == 'a') { + if (p[0] != 0) { + fprintf(stderr, "-a must only be given a number\n"); + exit(1); + } + p=","; + } + if (*p != ',') { fprintf(stderr, "-A takes N,PATTERN format of argument, where N is a number\n"); exit(1); } - /* strlen(p+1) + 1 eq strlen(p) */ - pa = (struct aligns *)malloc(sizeof(*pa) + strlen(p)); - pa->align = i; - pa->next = NULL; - strcpy(pa->pattern, p + 1); - if (!alignlist) - alignlist = pa; - else { - for (pa2 = alignlist; pa2->next; pa2 = pa2->next) - ; - pa2->next = pa; - } + addpattern(EXTTYPE_ALIGNMENT,i,p+1); break; + case 'i': case 'x': - pe = (struct excludes *)malloc(sizeof(*pe) + strlen(optarg) + 1); - pe->next = NULL; - strcpy(pe->pattern, optarg); - if (!excludelist) - excludelist = pe; - else { - for (pe2 = excludelist; pe2->next; pe2 = pe2->next) - ; - pe2->next = pe; + addpattern(EXTTYPE_EXCLUDE,c=='x',optarg); + break; + /* -e EXT[:VAL][,PATTERN] */ + case 'e': + i = (unsigned int)-1; + optpat = strchr(optarg,','); + if (optpat) { *optpat++ = 0; } + else { optpat=""; } + optn = strchr(optarg,':'); + if (optn) { + *optn++ = 0; + i = strtoul(optn,&p,0); + if (*p != 0) { + fprintf(stderr,"-e%s:N,PATTERN must be numeric\n",optarg); + exit(1); + } + } + /* -ealign:N,PATTERN */ + if (!strcmp(optarg,"align")) { + if (i == (unsigned int)-1) { + fprintf(stderr,"-e%s:N,PATTERN needs value\n",optarg); + exit(1); + } + if (i < 16 || (i & (i - 1))) { + fprintf(stderr, "Alignment has to be at least 16 bytes and a power of two\n"); + exit(1); + } + addpattern(EXTTYPE_ALIGNMENT,i,optpat); + /* -eperm:N[,PATTERN] - set permissions for pattern */ + /* -eperm[,PATTERN] - save permissions for pattern */ + } else if (!strcmp(optarg,"perm")) { + /* reparse it in octal */ + if (optn) { + i = strtoul(optn,&p,8); + if (*p != 0 || (i != (unsigned int)-1 && i&~07777)) { + fprintf(stderr,"-e%s:N must be octal and less than 07777\n",optarg); + exit(1); + } + } + addpattern(EXTTYPE_EXTPERM,i,optpat); + /* -euid:N[,PATTERN] - set uid for pattern */ + /* -euid[,PATTERN] - save uid for pattern */ + } else if (!strcmp(optarg,"uid")) { + addpattern(EXTTYPE_EXTUID,i,optpat); + /* -egid:N[,PATTERN] - set uid for pattern */ + /* -egid[,PATTERN] - save uid for pattern */ + } else if (!strcmp(optarg,"gid")) { + addpattern(EXTTYPE_EXTGID,i,optpat); + /* -etime:N[,PATTERN] - set timestamp for pattern */ + /* -etime[,PATTERN] - save timestamp for pattern */ + } else if (!strcmp(optarg,"time")) { + addpattern(EXTTYPE_EXTTIME,i,optpat); + } else { + fprintf(stderr,"-e%s not recognised\n",optarg); } break; default: @@ -797,11 +1079,11 @@ perror(outf); exit(1); } - + realbase = strlen(dir); root = newnode(dir, volname, 0); root->parent = root; - lastoff = processdir (1, dir, dir, &sb, root, root, spaceneeded(root)); + lastoff = processdir (1, dir, dir, &sb, root, root, spaceneeded(root,0)); if (verbose) shownode(0, root, stderr); dumpall(root, lastoff, f); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/genromfs.lsm new/genromfs-0.5.7/genromfs.lsm --- old/genromfs-0.5.2/genromfs.lsm 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/genromfs.lsm 2009-02-15 11:48:15.000000000 +0100 @@ -1,7 +1,7 @@ Begin3 Title: genromfs -Version: 0.5.2 -Entered-date: 26 Jan 2007 +Version: 0.5.7 +Entered-date: 15 Feb 2009 Description: This is the mkfs equivalent for romfs filesystem. You need it to build such a filesystem. romfs is a small, read-only filesystem intended for installation/rescue @@ -11,7 +11,7 @@ Author: chexum+dev () gmail.com (Janos Farkas) Maintained-by: chexum+dev () gmail.com (Janos Farkas) Primary-site: sunsite.unc.edu /pub/Linux/system/recovery/ - 24kB genromfs-0.5.2.tar.gz + 28kB genromfs-0.5.7.tar.gz Platforms: Linux 2.0 or later, gcc Copying-policy: GPL End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/romfs.txt new/genromfs-0.5.7/romfs.txt --- old/genromfs-0.5.2/romfs.txt 2007-06-26 19:08:47.000000000 +0200 +++ new/genromfs-0.5.7/romfs.txt 2009-02-15 11:48:15.000000000 +0100 @@ -28,10 +28,10 @@ which has only this filesystem linked in, and then can load any module later, with the current module utilities. It can also be used to run some program to decide if you need SCSI devices, and even IDE or -floppy drives can be loaded later if you use the "initrd"--initial -RAM disk--feature of the kernel. This would not be really news -flash, but with romfs, you can even spare off your ext2 or minix or -maybe even affs filesystem until you really know that you need it. +floppy drives can be loaded later if you use the "initrd"--initial RAM +disk--feature of the kernel. This would not be really news flash, but +with romfs, you can even spare off your ext2 or minix or maybe even +affs filesystem until you really know that you need it. For example, a distribution boot disk can contain only the cd disk drivers (and possibly the SCSI drivers), and the ISO 9660 filesystem @@ -44,13 +44,13 @@ purpose, just because it won't fit into ext2. romfs operates on block devices as you can expect, and the underlying -structure is very simple. Every accessible structure begins on 16 -byte boundaries for fast access. The minimum space a file will take -is 32 bytes (this is an empty file, with a less than 16 character -name). The maximum overhead for any non-empty file is the header, and -the 16 byte padding for the name and the contents, also 16+14+15 = 45 -bytes. This is quite rare however, since most file names are longer -than 3 bytes, and shorter than 15 bytes. +structure is very simple. Every accessible structure begins on a 16 +byte boundary for fast access. The minimum space a file will take is +32 bytes (this is an empty file, with a name shorter than 16 +characters). The maximum overhead for any non-empty file is the +header, and the 16 byte padding for the name and the contents, thus +16+14+15 = 45 bytes. This is quite rare however, since most file +names are longer than 3 bytes, and shorter than 15 bytes. The layout of the filesystem is the following: @@ -127,13 +127,14 @@ Note that hard links are specifically marked in this filesystem, but they will behave as you can expect (i.e. share the inode number). -Note also that it is your responsibility to not create hard link -loops, and creating all the . and .. links for directories. This is -normally done correctly by the genromfs program. Please refrain from -using the executable bits for special purposes on the socket and fifo -special files, they may have other uses in the future. Additionally, -please remember that only regular files, and symlinks are supposed to -have a nonzero size field; they contain the number of bytes available +Note also that as the filesystem is readonly, the program creating it +must not create hard link loops, and must create all the . and .. +links for directories the way UNIX programs expect. This is normally +done correctly by the genromfs program. Please refrain from using the +executable bits for special purposes on the socket and fifo special +files, they may have other uses in the future. Additionally, please +remember that only regular files, and symlinks are supposed to have a +nonzero size field; they contain the number of bytes available directly after the (padded) file name. Another thing to note is that romfs works on file headers and data @@ -143,18 +144,10 @@ padded to an 1024 byte boundary. If you have any problems or suggestions concerning this file system, -please contact me. However, think twice before wanting me to add -features and code, because the primary and most important advantage of -this file system is the small code. On the other hand, don't be -alarmed, I'm not getting that much romfs related mail. Now I can -understand why Avery wrote poems in the ARCnet docs to get some more -feedback. :) - -romfs has also a mailing list, and to date, it hasn't received any -traffic, so you are welcome to join it to discuss your ideas. :) - -It's run by ezmlm, so you can subscribe to it by sending a message -to romfs-subscribe(a)shadow.banki.hu, the content is irrelevant. +please contact me. I'd appreciate if you could bear in mind the +primary goals of the filesystem, that is being as small as possible +while having only the most essential features to have a running Linux +system on it. There is a web page about romfs at: @@ -174,17 +167,9 @@ - Since the files are only required to have alignment on a 16 byte boundary, it is currently possibly suboptimal to read or execute files -from the filesystem. It might be resolved by reordering file data to -have most of it (i.e. except the start and the end) laying at "natural" -boundaries, thus it would be possible to directly map a big portion of -the file contents to the mm subsystem. +from the filesystem. It is possible to reorder the file data to have +it at "natural" sector alignment, but to efficiently use it, there +might be need for other supporting code. - Compression might be an useful feature, but memory is quite a limiting factor in my eyes. - -- Where it is used? - -- Does it work on other architectures than intel and motorola? - -Have fun, -Janos Farkas <chexum(a)shadow.banki.hu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/1.ok new/genromfs-0.5.7/selftest/1.ok --- old/genromfs-0.5.2/selftest/1.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/1.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,9 @@ +0000000: 2d72 6f6d 3166 732d 0000 0060 02d9 ccb2 -rom1fs-...`.... +0000010: 454d 5054 5900 0000 0000 0000 0000 0000 EMPTY........... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0000 0000 0020 0000 0000 d1d1 ffe0 ....... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/10.ok new/genromfs-0.5.7/selftest/10.ok --- old/genromfs-0.5.2/selftest/10.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/10.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,12 @@ +0000000: 2d72 6f6d 3166 732d 0000 0090 25cf 1bc3 -rom1fs-....%... +0000010: 494e 434c 5544 4553 0000 0000 0000 0000 INCLUDES........ +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0002 0000 0000 0000 0007 6a1c 181f ............j... +0000070: 676f 6f64 2e74 7874 0000 0000 0000 0000 good.txt........ +0000080: 7761 6e74 6564 0a00 0000 0000 0000 0000 wanted.......... +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/11.ok new/genromfs-0.5.7/selftest/11.ok --- old/genromfs-0.5.2/selftest/11.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/11.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,17 @@ +0000000: 2d72 6f6d 3166 732d 0000 0110 dd55 543d -rom1fs-.....UT= +0000010: 414c 4947 4e4e 4557 0000 0000 0000 0000 ALIGNNEW........ +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 00e2 0000 0000 0000 0004 d5d1 8bb2 ................ +0000070: 2a2e 7368 0000 0000 0000 0000 0000 0000 *.sh............ +0000080: 6465 6c0a 0000 0000 0000 0000 0000 0000 del............. +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00000e0: 0000 0002 0000 0000 0000 0008 b25d 1618 .............].. +00000f0: 7374 7566 662e 7478 7400 0000 0000 0000 stuff.txt....... +0000100: 616c 6967 6e65 640a 0000 0000 0000 0000 aligned......... +0000110: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/12.ok new/genromfs-0.5.7/selftest/12.ok --- old/genromfs-0.5.2/selftest/12.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/12.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,33 @@ +0000000: 2d72 6f6d 3166 732d 0000 01e0 f1f7 c9d6 -rom1fs-........ +0000010: 5045 524d 4953 5349 4f4e 5300 0000 0000 PERMISSIONS..... +0000020: 0000 0049 0000 0020 0000 0000 ffff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 7879 7a00 5986 8600 ........xyz.Y... +0000040: 0000 0070 0000 0020 0000 0000 d1d1 ff70 ...p... .......p +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0000 0000 403e 7879 7a01 c245 8687 ......@>xyz..E.. +0000070: 0000 00b2 0000 0000 0000 0005 2451 591b ............$QY. +0000080: 6736 322e 7478 7400 0000 0000 0000 0000 g62.txt......... +0000090: 7878 7878 0a00 0000 0000 0000 0000 0000 xxxx............ +00000a0: 0000 0000 0000 1949 7879 7a01 b76c 8687 .......Ixyz..l.. +00000b0: 0000 00fa 0000 0000 0000 0005 5e16 555c ............^.U\ +00000c0: 7375 3131 2e74 7874 0000 0000 0000 0000 su11.txt........ +00000d0: 7a7a 7a7a 0a00 0000 0000 0000 0000 0000 zzzz............ +00000e0: 0000 0000 2ffe 1949 7879 7a01 b76c 8857 ..../..Ixyz..l.W +00000f0: 0000 013a 0000 0000 0000 0005 2ba0 e8e4 ...:........+... +0000100: 7375 6736 3275 3633 2e74 7874 0000 0000 sug62u63.txt.... +0000110: 7a7a 7a7a 0a00 0000 0000 0000 0000 0000 zzzz............ +0000120: 0000 0000 4080 307f 7879 7a01 8155 0647 ....@.0.xyz..U.G +0000130: 0000 0172 0000 0000 0000 0005 f529 21a6 ...r.........)!. +0000140: 7531 3237 6731 3238 2e74 7874 0000 0000 u127g128.txt.... +0000150: 7171 7171 0a00 0000 0000 0000 0000 0000 qqqq............ +0000160: 0000 0000 0000 303f 7879 7a01 c155 8687 ......0?xyz..U.. +0000170: 0000 01b2 0000 0000 0000 0005 1651 571b .............QW. +0000180: 7536 332e 7478 7400 0000 0000 0000 0000 u63.txt......... +0000190: 7878 7878 0a00 0000 0000 0000 0000 0000 xxxx............ +00001a0: 0000 0000 0000 2ffe 7879 7a01 0256 8687 ....../.xyz..V.. +00001b0: 0000 0002 0000 0000 0000 0005 dc23 9e1e .............#.. +00001c0: 7536 3367 3632 2e74 7874 0000 0000 0000 u63g62.txt...... +00001d0: 7979 7979 0a00 0000 0000 0000 0000 0000 yyyy............ +00001e0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/13.ok new/genromfs-0.5.7/selftest/13.ok --- old/genromfs-0.5.2/selftest/13.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/13.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,27 @@ +0000000: 2d72 6f6d 3166 732d 0000 0180 afe5 1bf6 -rom1fs-........ +0000010: 4445 5649 4345 5300 0000 0000 0000 0000 DEVICES......... +0000020: 0000 0049 0000 0020 0000 0000 ffff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 7879 7a00 5986 8600 ........xyz.Y... +0000040: 0000 0070 0000 0020 0000 0000 d1d1 ff70 ...p... .......p +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0000 0000 11c9 7879 7a01 3774 8687 ........xyz.7t.. +0000070: 0000 0159 0000 0090 0000 0000 9b9a 8817 ...Y............ +0000080: 6465 7600 0000 0000 0000 0000 0000 0000 dev............. +0000090: 0000 00b0 0000 0070 0000 0000 d1ff fee0 .......p........ +00000a0: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +00000b0: 0000 00e0 0000 0020 0000 0000 d1d1 ff00 ....... ........ +00000c0: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +00000d0: 0000 0000 0000 11b6 7879 7a01 4a74 8687 ........xyz.Jt.. +00000e0: 0000 0115 0001 0003 0000 0000 9189 927c ...............| +00000f0: 6e75 6c6c 0000 0000 0000 0000 0000 0000 null............ +0000100: 0000 0000 0000 11b6 7879 7a01 4a74 8687 ........xyz.Jt.. +0000110: 0000 0005 0001 0005 0000 0000 8599 8d87 ................ +0000120: 7a65 726f 0000 0000 0000 0000 0000 0000 zero............ +0000130: 0000 0000 0000 0000 0000 0000 0000 5049 ..............PI +0000140: 5960 52d2 40c8 3064 7879 7a02 81b2 5ded Y`R.@.0dxyz...]. +0000150: 0000 0002 0000 0000 0000 000b f16c 294a .............l)J +0000160: 6665 6231 342e 7478 7400 0000 0000 0000 feb14.txt....... +0000170: 3132 3334 3536 3738 3930 0a00 0000 0000 1234567890...... +0000180: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/2.ok new/genromfs-0.5.7/selftest/2.ok --- old/genromfs-0.5.2/selftest/2.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/2.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,12 @@ +0000000: 2d72 6f6d 3166 732d 0000 0090 d7d4 1ad9 -rom1fs-........ +0000010: 5349 4e47 4c45 4649 4c45 0000 0000 0000 SINGLEFILE...... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0002 0000 0000 0000 0006 228a 928b ............"... +0000070: 6475 6d6d 7900 0000 0000 0000 0000 0000 dummy........... +0000080: 6475 6d6d 790a 0000 0000 0000 0000 0000 dummy........... +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/3.ok new/genromfs-0.5.7/selftest/3.ok --- old/genromfs-0.5.2/selftest/3.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/3.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,14 @@ +0000000: 2d72 6f6d 3166 732d 0000 00b0 2f1d 0eba -rom1fs-..../... +0000010: 4841 5244 4c49 4e4b 0000 0000 0000 0000 HARDLINK........ +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0092 0000 0000 0000 0006 228a 91fb ............"... +0000070: 6475 6d6d 7900 0000 0000 0000 0000 0000 dummy........... +0000080: 6475 6d6d 790a 0000 0000 0000 0000 0000 dummy........... +0000090: 0000 0000 0000 0060 0000 0000 2b35 1ed1 .......`....+5.. +00000a0: 6861 7264 6c69 6e6b 0000 0000 0000 0000 hardlink........ +00000b0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/4.ok new/genromfs-0.5.7/selftest/4.ok --- old/genromfs-0.5.2/selftest/4.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/4.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,21 @@ +0000000: 2d72 6f6d 3166 732d 0000 0250 3b02 526e -rom1fs-...P;.Rn +0000010: 414c 4947 4e45 4400 0000 0000 0000 0000 ALIGNED......... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 01e2 0000 0000 0000 0007 1255 cc9f .............U.. +0000070: 7430 3178 797a 0000 0000 0000 0000 0000 t01xyz.......... +0000080: 7430 3161 6263 0a00 0000 0000 0000 0000 t01abc.......... +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00001e0: 0000 0222 0000 0000 0000 001d 1558 cb4c ...".........X.L +00001f0: 7430 3275 7677 0000 0000 0000 0000 0000 t02uvw.......... +0000200: 2835 3132 616c 6967 6e65 6430 3132 3334 (512aligned01234 +0000210: 3536 3738 3961 6263 6465 6629 0a00 0000 56789abcdef).... +0000220: 0000 0002 0000 0000 0000 0007 185b cc85 .............[.. +0000230: 7430 3372 7374 0000 0000 0000 0000 0000 t03rst.......... +0000240: 7430 3367 6869 0a00 0000 0000 0000 0000 t03ghi.......... +0000250: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/5.ok new/genromfs-0.5.7/selftest/5.ok --- old/genromfs-0.5.2/selftest/5.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/5.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,21 @@ +0000000: 2d72 6f6d 3166 732d 0000 0120 17fb d72b -rom1fs-... ...+ +0000010: 4142 5341 4c49 474e 4544 0000 0000 0000 ABSALIGNED...... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0092 0000 0000 0000 0007 1255 cdef .............U.. +0000070: 7430 3178 797a 0000 0000 0000 0000 0000 t01xyz.......... +0000080: 7430 3161 6263 0a00 0000 0000 0000 0000 t01abc.......... +0000090: 0000 00e2 0000 0000 0000 0007 1558 cca2 .............X.. +00000a0: 7430 3275 7677 0000 0000 0000 0000 0000 t02uvw.......... +00000b0: 7430 3264 6566 0a00 0000 0000 0000 0000 t02def.......... +00000c0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +00000d0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +00000e0: 0000 0002 0000 0000 0000 001d 88d0 31b3 ..............1. +00000f0: 7430 335f 3132 3361 6c69 676e 6564 0000 t03_123aligned.. +0000100: 2831 3238 616c 6967 6e65 6430 3132 3334 (128aligned01234 +0000110: 3536 3738 3961 6263 6465 6629 0a00 0000 56789abcdef).... +0000120: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/6.ok new/genromfs-0.5.7/selftest/6.ok --- old/genromfs-0.5.2/selftest/6.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/6.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,23 @@ +0000000: 2d72 6f6d 3166 732d 0000 0140 e9ea aa30 -rom1fs-...@...0 +0000010: 4558 5444 4154 4100 0000 0000 0000 0000 EXTDATA......... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0092 0000 0000 0000 0010 b862 1db5 .............b.. +0000070: 726f 6d31 612e 7478 7400 0000 0000 0000 rom1a.txt....... +0000080: 3031 3233 3031 3233 7575 7531 3031 320a 01230123uuu1012. +0000090: 0000 00d2 0000 0000 0000 0010 b762 1d75 .............b.u +00000a0: 726f 6d31 622e 7478 7400 0000 0000 0000 rom1b.txt....... +00000b0: 3031 3233 3031 3233 7879 7a61 3031 320a 01230123xyza012. +00000c0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +00000d0: 0000 0113 0000 0000 0000 000c b662 2d4f .............b-O +00000e0: 726f 6d31 632e 6461 7400 0000 0000 0000 rom1c.dat....... +00000f0: 3031 3233 3031 3233 7879 7a31 0000 0000 01230123xyz1.... +0000100: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +0000110: 0000 0003 0000 0000 0000 0009 b562 1e4b .............b.K +0000120: 726f 6d31 642e 7478 7400 0000 0000 0000 rom1d.txt....... +0000130: 726f 6d31 622e 7478 7400 0000 0000 0000 rom1b.txt....... +0000140: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/7.ok new/genromfs-0.5.7/selftest/7.ok --- old/genromfs-0.5.2/selftest/7.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/7.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,17 @@ +0000000: 2d72 6f6d 3166 732d 0000 0110 52ee 265d -rom1fs-....R.&] +0000010: 4445 4641 4c49 474e 4544 0000 0000 0000 DEFALIGNED...... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 00e2 0000 0000 0000 0005 2a25 27eb ............*%'. +0000070: 6162 632e 7478 7400 0000 0000 0000 0000 abc.txt......... +0000080: 3031 3233 0a00 0000 0000 0000 0000 0000 0123............ +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00000e0: 0000 0002 0000 0000 0000 0005 2722 25cb ............'"%. +00000f0: 6465 662e 7478 7400 0000 0000 0000 0000 def.txt......... +0000100: 3435 3637 0a00 0000 0000 0000 0000 0000 4567............ +0000110: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/8.ok new/genromfs-0.5.7/selftest/8.ok --- old/genromfs-0.5.2/selftest/8.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/8.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,19 @@ +0000000: 2d72 6f6d 3166 732d 0000 0810 c342 3775 -rom1fs-.....B7u +0000010: 4d55 4c54 4941 4c49 474e 4544 0000 0000 MULTIALIGNED.... +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 01e0 0000 0020 0000 0000 d1d1 fe00 ....... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00001e0: 0000 07e2 0000 0000 0000 0008 f067 503c .............gP< +00001f0: 6d36 386b 2e62 6f6f 7400 0000 0000 0000 m68k.boot....... +0000200: 626f 6f74 3531 320a 0000 0000 0000 0000 boot512......... +0000210: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00007e0: 0000 0002 0000 0000 0000 0009 b9ed 3c14 ..............<. +00007f0: 7370 6172 632e 626f 6f74 0000 0000 0000 sparc.boot...... +0000800: 626f 6f74 3230 3438 0a00 0000 0000 0000 boot2048........ +0000810: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +0000bf0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/9.ok new/genromfs-0.5.7/selftest/9.ok --- old/genromfs-0.5.2/selftest/9.ok 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/9.ok 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,12 @@ +0000000: 2d72 6f6d 3166 732d 0000 0090 32c1 24d3 -rom1fs-....2.$. +0000010: 4558 434c 5544 4553 0000 0000 0000 0000 EXCLUDES........ +0000020: 0000 0049 0000 0020 0000 0000 d1ff ff97 ...I... ........ +0000030: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ +0000040: 0000 0060 0000 0020 0000 0000 d1d1 ff80 ...`... ........ +0000050: 2e2e 0000 0000 0000 0000 0000 0000 0000 ................ +0000060: 0000 0002 0000 0000 0000 0007 9d9a 8b96 ................ +0000070: 6265 7461 0000 0000 0000 0000 0000 0000 beta............ +0000080: 6e65 6564 6564 0a00 0000 0000 0000 0000 needed.......... +0000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................ +* +00003f0: 0000 0000 0000 0000 0000 0000 0000 0000 ................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/Makefile new/genromfs-0.5.7/selftest/Makefile --- old/genromfs-0.5.2/selftest/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/Makefile 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,5 @@ +all check: + $(MAKE) -C .. $@ + +dotest test: + bash ./test.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/genromfs-0.5.2/selftest/test.sh new/genromfs-0.5.7/selftest/test.sh --- old/genromfs-0.5.2/selftest/test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/genromfs-0.5.7/selftest/test.sh 2009-02-15 11:48:15.000000000 +0100 @@ -0,0 +1,128 @@ +#!/bin/sh + +# requires: GNU md5sum and bash, xxd from vim +# known bug: file ordering is not actually specified + +NTESTS=13 +FAIL=0 +I=0 +V= +tdir=`pwd` +CMD=$tdir/../genromfs +mkdir testimg +cd testimg + +function testlabel () { + I=`expr $I + 1` + echo "$I/$NTESTS" "$@" + rm -f * + rm -f $tdir/img.bin +} + +function testsummary () { + xxd -a <$tdir/img.bin >$tdir/$I.out + if ! diff -u $tdir/$I.ok $tdir/$I.out; then + echo FAILED - Check differences above + FAIL=`expr $FAIL + 1` + else + echo OK + rm -f $tdir/$I.out + fi +} + +testlabel Test image with no files +eval $CMD $V -V EMPTY -f $tdir/img.bin +testsummary + +testlabel Test image with a single file +echo dummy >dummy +eval $CMD $V -V SINGLEFILE -f $tdir/img.bin +testsummary + +testlabel Test image with a hard links +echo dummy >dummy +ln dummy hardlink +eval $CMD $V -V HARDLINK -f $tdir/img.bin +testsummary + +testlabel Test image with alignment +echo t01abc >t01xyz +echo '(512aligned0123456789abcdef)' >t02uvw +echo t03ghi >t03rst +eval $CMD $V -V ALIGNED -A '512,t02*' -f $tdir/img.bin +testsummary + +testlabel Test image with alignment with absolute path +echo t01abc >t01xyz +echo t02def >t02uvw +echo '(128aligned0123456789abcdef)' >t03_123aligned +eval $CMD $V -V ABSALIGNED -A '128,/t03*' -f $tdir/img.bin +testsummary + +testlabel Test image with file data +echo 01230123uuu1012 >rom1a.txt +echo 01230123xyza012 >rom1b.txt +ln -s 01230123xyz1 rom1c.dat +ln -s rom1b.txt rom1d.txt +eval $CMD $V -V EXTDATA -f $tdir/img.bin +testsummary + +testlabel Test default alignment +echo 0123 >abc.txt +echo 4567 >def.txt +eval $CMD $V -V DEFALIGNED -a128 -f $tdir/img.bin +testsummary + +testlabel Test multiple alignment +echo boot512 >m68k.boot +echo boot2048 >sparc.boot +eval $CMD $V -V MULTIALIGNED -A2048,*.boot -A1024,m68k.boot -A512,m68k.boot -f $tdir/img.bin +testsummary + +testlabel Test excludes +echo unwanted >alpha +echo needed >beta +echo unwanted >gamma +eval $CMD $V -V EXCLUDES -x '"*a*a"' -f $tdir/img.bin +testsummary + +testlabel Test exclude/includes +echo wanted >good.txt +echo not >stuff.txt +echo del >erase.txt +eval $CMD $V -V INCLUDES -x '"*"' '"-i*good*"' -f $tdir/img.bin +testsummary + +testlabel Test new style alignment option +echo aligned >stuff.txt +echo del >*.sh +eval $CMD $V -V ALIGNNEW -ealign:256,*.txt -f $tdir/img.bin +testsummary + +testlabel Test permissions +echo xxxx >u63.txt +echo xxxx >g62.txt +echo yyyy >u63g62.txt +echo qqqq >u127g128.txt +echo zzzz >su11.txt +echo zzzz >sug62u63.txt +eval $CMD $V -V PERMISSIONS -euid:63,*u63* -egid:62,*g62* -euid:127,*127* -egid:128,*128* -eperm:4511,su* -f $tdir/img.bin +testsummary + +testlabel Test devices/permissions +mkdir dev +touch dev/@null,c,1,3 +touch dev/@zero,c,1,5 +echo 1234567890 >feb14.txt +eval $CMD $V -V DEVICES -eperm:711,/dev -eperm:666,/dev/* -etime:1234567890,feb14* -euid:100,feb* -egid:200,feb* -f $tdir/img.bin +testsummary +rm -rf dev + +# remove stray files +rm -f * + +# end +echo $FAIL failures found +cd $tdir +rm -f img.bin +rmdir testimg

1 0

commit python-PyMsgBox for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyMsgBox for openSUSE:Factory checked in at 2022-08-30 14:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyMsgBox (Old) and /work/SRC/openSUSE:Factory/.python-PyMsgBox.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyMsgBox" Tue Aug 30 14:50:33 2022 rev:5 rq:1000172 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyMsgBox/python-PyMsgBox.changes 2019-09-25 08:40:38.470285572 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyMsgBox.new.2083/python-PyMsgBox.changes 2022-08-30 14:51:20.536405533 +0200 @@ -1,0 +2,8 @@ +Sun Aug 28 22:33:36 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com> + +- Update to 1.0.9 + * no upstream changelog +- Update to 1.0.8 + * Text is automatically converted to string with str() + +------------------------------------------------------------------- Old: ---- PyMsgBox-1.0.7.tar.gz New: ---- PyMsgBox-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyMsgBox.spec ++++++ --- /var/tmp/diff_new_pack.obAwee/_old 2022-08-30 14:51:20.940406563 +0200 +++ /var/tmp/diff_new_pack.obAwee/_new 2022-08-30 14:51:20.948406584 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-PyMsgBox # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-PyMsgBox -Version: 1.0.7 +Version: 1.0.9 Release: 0 Summary: A Python module for JavaScript-like message boxes License: BSD-3-Clause ++++++ PyMsgBox-1.0.7.tar.gz -> PyMsgBox-1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/PKG-INFO new/PyMsgBox-1.0.9/PKG-INFO --- old/PyMsgBox-1.0.7/PKG-INFO 2019-06-18 20:19:48.834768500 +0200 +++ new/PyMsgBox-1.0.9/PKG-INFO 2020-10-11 03:51:28.239751000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyMsgBox -Version: 1.0.7 +Version: 1.0.9 Summary: A simple, cross-platform, pure Python module for JavaScript-like message boxes. Home-page: https://github.com/asweigart/pymsgbox Author: Al Sweigart @@ -48,4 +48,5 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Description-Content-Type: text/markdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/setup.py new/PyMsgBox-1.0.9/setup.py --- old/PyMsgBox-1.0.7/setup.py 2019-06-18 05:43:15.000000000 +0200 +++ new/PyMsgBox-1.0.9/setup.py 2020-10-11 03:50:33.000000000 +0200 @@ -33,6 +33,7 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8' + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/src/PyMsgBox.egg-info/PKG-INFO new/PyMsgBox-1.0.9/src/PyMsgBox.egg-info/PKG-INFO --- old/PyMsgBox-1.0.7/src/PyMsgBox.egg-info/PKG-INFO 2019-06-18 20:19:48.000000000 +0200 +++ new/PyMsgBox-1.0.9/src/PyMsgBox.egg-info/PKG-INFO 2020-10-11 03:51:27.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyMsgBox -Version: 1.0.7 +Version: 1.0.9 Summary: A simple, cross-platform, pure Python module for JavaScript-like message boxes. Home-page: https://github.com/asweigart/pymsgbox Author: Al Sweigart @@ -48,4 +48,5 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Description-Content-Type: text/markdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/src/PyMsgBox.egg-info/SOURCES.txt new/PyMsgBox-1.0.9/src/PyMsgBox.egg-info/SOURCES.txt --- old/PyMsgBox-1.0.7/src/PyMsgBox.egg-info/SOURCES.txt 2019-06-18 20:19:48.000000000 +0200 +++ new/PyMsgBox-1.0.9/src/PyMsgBox.egg-info/SOURCES.txt 2020-10-11 03:51:27.000000000 +0200 @@ -1,6 +1,7 @@ MANIFEST.in README.md code_of_conduct.md +pyproject.toml setup.py docs/Makefile docs/basics.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/src/pymsgbox/__init__.py new/PyMsgBox-1.0.9/src/pymsgbox/__init__.py --- old/PyMsgBox-1.0.7/src/pymsgbox/__init__.py 2019-06-18 07:14:38.000000000 +0200 +++ new/PyMsgBox-1.0.9/src/pymsgbox/__init__.py 2020-10-11 03:50:42.000000000 +0200 @@ -1,7 +1,7 @@ # PyMsgBox - A simple, cross-platform, pure Python module for JavaScript-like message boxes. # By Al Sweigart al(a)inventwithpython.com -__version__ = '1.0.7' +__version__ = "1.0.9" # Modified BSD License # Derived from Stephen Raymond Ferg's EasyGui http://easygui.sourceforge.net/ @@ -36,6 +36,7 @@ """ import sys + RUNNING_PYTHON_2 = sys.version_info[0] == 2 # Because PyAutoGUI requires PyMsgBox but might be installed on systems @@ -50,38 +51,43 @@ else: import tkinter as tk - rootWindowPosition = '+300+200' + rootWindowPosition = "+300+200" - if tk.TkVersion < 8.0 : - raise RuntimeError('You are running Tk version: ' + str(tk.TkVersion) + 'You must be using Tk version 8.0 or greater to use PyMsgBox.') + if tk.TkVersion < 8.0: + raise RuntimeError( + "You are running Tk version: " + + str(tk.TkVersion) + + "You must be using Tk version 8.0 or greater to use PyMsgBox." + ) except ImportError: TKINTER_IMPORT_SUCCEEDED = False +PROPORTIONAL_FONT_FAMILY = ("MS", "Sans", "Serif") +MONOSPACE_FONT_FAMILY = "Courier" -PROPORTIONAL_FONT_FAMILY = ('MS', 'Sans', 'Serif') -MONOSPACE_FONT_FAMILY = ('Courier') - -PROPORTIONAL_FONT_SIZE = 10 -MONOSPACE_FONT_SIZE = 9 #a little smaller, because it it more legible at a smaller size -TEXT_ENTRY_FONT_SIZE = 12 # a little larger makes it easier to see +PROPORTIONAL_FONT_SIZE = 10 +MONOSPACE_FONT_SIZE = ( + 9 +) # a little smaller, because it it more legible at a smaller size +TEXT_ENTRY_FONT_SIZE = 12 # a little larger makes it easier to see -STANDARD_SELECTION_EVENTS = ['Return', 'Button-1', 'space'] +STANDARD_SELECTION_EVENTS = ["Return", "Button-1", "space"] # constants for strings: (TODO: for internationalization, change these) -OK_TEXT = 'OK' -CANCEL_TEXT = 'Cancel' -YES_TEXT = 'Yes' -NO_TEXT = 'No' -RETRY_TEXT = 'Retry' -ABORT_TEXT = 'Abort' -IGNORE_TEXT = 'Ignore' -TRY_AGAIN_TEXT = 'Try Again' -CONTINUE_TEXT = 'Continue' +OK_TEXT = "OK" +CANCEL_TEXT = "Cancel" +YES_TEXT = "Yes" +NO_TEXT = "No" +RETRY_TEXT = "Retry" +ABORT_TEXT = "Abort" +IGNORE_TEXT = "Ignore" +TRY_AGAIN_TEXT = "Try Again" +CONTINUE_TEXT = "Continue" -TIMEOUT_RETURN_VALUE = 'Timeout' +TIMEOUT_RETURN_VALUE = "Timeout" # Initialize some global variables that will be reset later __choiceboxMultipleSelect = None @@ -90,8 +96,8 @@ __choiceboxResults = None __firstWidget = None __enterboxText = None -__enterboxDefaultText='' -__multenterboxText = '' +__enterboxDefaultText = "" +__multenterboxText = "" choiceboxChoices = None choiceboxWidget = None entryWidget = None @@ -99,50 +105,72 @@ buttonsFrame = None - - - -def _alertTkinter(text='', title='', button=OK_TEXT, root=None, timeout=None): +def _alertTkinter(text="", title="", button=OK_TEXT, root=None, timeout=None): """Displays a simple message box with text and a single OK button. Returns the text of the button clicked on.""" - assert TKINTER_IMPORT_SUCCEEDED, 'Tkinter is required for pymsgbox' - retVal = _buttonbox(msg=text, title=title, choices=[str(button)], root=root, timeout=timeout) + assert TKINTER_IMPORT_SUCCEEDED, "Tkinter is required for pymsgbox" + text = str(text) + retVal = _buttonbox( + msg=text, title=title, choices=[str(button)], root=root, timeout=timeout + ) if retVal is None: return button else: return retVal + + alert = _alertTkinter -def _confirmTkinter(text='', title='', buttons=(OK_TEXT, CANCEL_TEXT), root=None, timeout=None): +def _confirmTkinter( + text="", title="", buttons=(OK_TEXT, CANCEL_TEXT), root=None, timeout=None +): """Displays a message box with OK and Cancel buttons. Number and text of buttons can be customized. Returns the text of the button clicked on.""" - assert TKINTER_IMPORT_SUCCEEDED, 'Tkinter is required for pymsgbox' - return _buttonbox(msg=text, title=title, choices=[str(b) for b in buttons], root=root, timeout=timeout) + assert TKINTER_IMPORT_SUCCEEDED, "Tkinter is required for pymsgbox" + text = str(text) + return _buttonbox( + msg=text, + title=title, + choices=[str(b) for b in buttons], + root=root, + timeout=timeout, + ) + + confirm = _confirmTkinter -def _promptTkinter(text='', title='' , default='', root=None, timeout=None): +def _promptTkinter(text="", title="", default="", root=None, timeout=None): """Displays a message box with text input, and OK & Cancel buttons. Returns the text entered, or None if Cancel was clicked.""" - assert TKINTER_IMPORT_SUCCEEDED, 'Tkinter is required for pymsgbox' - return __fillablebox(text, title, default=default, mask=None,root=root, timeout=timeout) + assert TKINTER_IMPORT_SUCCEEDED, "Tkinter is required for pymsgbox" + text = str(text) + return __fillablebox( + text, title, default=default, mask=None, root=root, timeout=timeout + ) + + prompt = _promptTkinter -def _passwordTkinter(text='', title='', default='', mask='*', root=None, timeout=None): +def _passwordTkinter(text="", title="", default="", mask="*", root=None, timeout=None): """Displays a message box with text input, and OK & Cancel buttons. Typed characters appear as *. Returns the text entered, or None if Cancel was clicked.""" - assert TKINTER_IMPORT_SUCCEEDED, 'Tkinter is required for pymsgbox' + assert TKINTER_IMPORT_SUCCEEDED, "Tkinter is required for pymsgbox" + text = str(text) return __fillablebox(text, title, default, mask=mask, root=root, timeout=timeout) + + password = _passwordTkinter # Load the native versions of the alert/confirm/prompt/password functions, if available: -if sys.platform == 'win32': +if sys.platform == "win32": from . import _native_win - NO_ICON = 0 - STOP = 0x10 + + NO_ICON = 0 + STOP = 0x10 QUESTION = 0x20 - WARNING = 0x30 - INFO = 0x40 - alert = _native_win.alert + WARNING = 0x30 + INFO = 0x40 + alert = _native_win.alert confirm = _native_win.confirm @@ -165,7 +193,6 @@ """ global boxRoot, __replyButtonText, __widgetTexts, buttonsFrame - # Initialize __replyButtonText to the first choice. # This is what will be used if the window is closed by the close button. __replyButtonText = choices[0] @@ -179,7 +206,7 @@ boxRoot.withdraw() boxRoot.title(title) - boxRoot.iconname('Dialog') + boxRoot.iconname("Dialog") boxRoot.geometry(rootWindowPosition) boxRoot.minsize(400, 100) @@ -194,7 +221,7 @@ # -------------------- place the widgets in the frames ----------------------- messageWidget = tk.Message(messageFrame, text=msg, width=400) messageWidget.configure(font=(PROPORTIONAL_FONT_FAMILY, PROPORTIONAL_FONT_SIZE)) - messageWidget.pack(side=tk.TOP, expand=tk.YES, fill=tk.X, padx='3m', pady='3m') + messageWidget.pack(side=tk.TOP, expand=tk.YES, fill=tk.X, padx="3m", pady="3m") __put_buttons_in_buttonframe(choices) @@ -212,7 +239,8 @@ if __replyButtonText != TIMEOUT_RETURN_VALUE: __replyButtonText = None - if root: root.deiconify() + if root: + root.deiconify() return __replyButtonText @@ -228,7 +256,9 @@ for buttonText in choices: tempButton = tk.Button(buttonsFrame, takefocus=1, text=buttonText) _bindArrows(tempButton) - tempButton.pack(expand=tk.YES, side=tk.LEFT, padx='1m', pady='1m', ipadx='2m', ipady='1m') + tempButton.pack( + expand=tk.YES, side=tk.LEFT, padx="1m", pady="1m", ipadx="2m", ipady="1m" + ) # remember the text associated with this widget __widgetTexts[tempButton] = buttonText @@ -239,46 +269,49 @@ i = 1 # for the commandButton, bind activation events to the activation event handler - commandButton = tempButton + commandButton = tempButton handler = __buttonEvent for selectionEvent in STANDARD_SELECTION_EVENTS: - commandButton.bind('<%s>' % selectionEvent, handler) + commandButton.bind("<%s>" % selectionEvent, handler) if CANCEL_TEXT in choices: - commandButton.bind('<Escape>', __cancelButtonEvent) + commandButton.bind("<Escape>", __cancelButtonEvent) def _bindArrows(widget, skipArrowKeys=False): - widget.bind('<Down>', _tabRight) - widget.bind('<Up>' , _tabLeft) + widget.bind("<Down>", _tabRight) + widget.bind("<Up>", _tabLeft) if not skipArrowKeys: - widget.bind('<Right>',_tabRight) - widget.bind('<Left>' , _tabLeft) + widget.bind("<Right>", _tabRight) + widget.bind("<Left>", _tabLeft) + def _tabRight(event): - boxRoot.event_generate('<Tab>') + boxRoot.event_generate("<Tab>") + def _tabLeft(event): - boxRoot.event_generate('<Shift-Tab>') + boxRoot.event_generate("<Shift-Tab>") def __buttonEvent(event): """ Handle an event that is generated by a person clicking a button. """ - global boxRoot, __widgetTexts, __replyButtonText + global boxRoot, __widgetTexts, __replyButtonText __replyButtonText = __widgetTexts[event.widget] - boxRoot.quit() # quit the main loop + boxRoot.quit() # quit the main loop + def __cancelButtonEvent(event): """Handle pressing Esc by clicking the Cancel button.""" - global boxRoot, __widgetTexts, __replyButtonText + global boxRoot, __widgetTexts, __replyButtonText __replyButtonText = CANCEL_TEXT boxRoot.quit() -def __fillablebox(msg, title='', default='', mask=None, root=None, timeout=None): +def __fillablebox(msg, title="", default="", mask=None, root=None, timeout=None): """ Show a box in which a user can enter some text. You may optionally specify some default text, which will appear in the @@ -290,11 +323,11 @@ global cancelButton, entryWidget, okButton if title == None: - title == '' + title == "" if default == None: - default = '' + default = "" __enterboxDefaultText = default - __enterboxText = __enterboxDefaultText + __enterboxText = __enterboxDefaultText if root: root.withdraw() @@ -305,9 +338,9 @@ boxRoot.withdraw() boxRoot.title(title) - boxRoot.iconname('Dialog') + boxRoot.iconname("Dialog") boxRoot.geometry(rootWindowPosition) - boxRoot.bind('<Escape>', __enterboxCancel) + boxRoot.bind("<Escape>", __enterboxCancel) # ------------- define the messageFrame --------------------------------- messageFrame = tk.Frame(master=boxRoot) @@ -317,7 +350,6 @@ buttonsFrame = tk.Frame(master=boxRoot) buttonsFrame.pack(side=tk.TOP, fill=tk.BOTH) - # ------------- define the entryFrame --------------------------------- entryFrame = tk.Frame(master=boxRoot) entryFrame.pack(side=tk.TOP, fill=tk.BOTH) @@ -326,10 +358,10 @@ buttonsFrame = tk.Frame(master=boxRoot) buttonsFrame.pack(side=tk.TOP, fill=tk.BOTH) - #-------------------- the msg widget ---------------------------- - messageWidget = tk.Message(messageFrame, width='4.5i', text=msg) + # -------------------- the msg widget ---------------------------- + messageWidget = tk.Message(messageFrame, width="4.5i", text=msg) messageWidget.configure(font=(PROPORTIONAL_FONT_FAMILY, PROPORTIONAL_FONT_SIZE)) - messageWidget.pack(side=tk.RIGHT, expand=1, fill=tk.BOTH, padx='3m', pady='3m') + messageWidget.pack(side=tk.RIGHT, expand=1, fill=tk.BOTH, padx="3m", pady="3m") # --------- entryWidget ---------------------------------------------- entryWidget = tk.Entry(entryFrame, width=40) @@ -337,47 +369,49 @@ entryWidget.configure(font=(PROPORTIONAL_FONT_FAMILY, TEXT_ENTRY_FONT_SIZE)) if mask: entryWidget.configure(show=mask) - entryWidget.pack(side=tk.LEFT, padx='3m') - entryWidget.bind('<Return>', __enterboxGetText) - entryWidget.bind('<Escape>', __enterboxCancel) + entryWidget.pack(side=tk.LEFT, padx="3m") + entryWidget.bind("<Return>", __enterboxGetText) + entryWidget.bind("<Escape>", __enterboxCancel) # put text into the entryWidget and have it pre-highlighted - if __enterboxDefaultText != '': - entryWidget.insert(0,__enterboxDefaultText) + if __enterboxDefaultText != "": + entryWidget.insert(0, __enterboxDefaultText) entryWidget.select_range(0, tk.END) # ------------------ ok button ------------------------------- okButton = tk.Button(buttonsFrame, takefocus=1, text=OK_TEXT) _bindArrows(okButton) - okButton.pack(expand=1, side=tk.LEFT, padx='3m', pady='3m', ipadx='2m', ipady='1m') + okButton.pack(expand=1, side=tk.LEFT, padx="3m", pady="3m", ipadx="2m", ipady="1m") # for the commandButton, bind activation events to the activation event handler - commandButton = okButton + commandButton = okButton handler = __enterboxGetText for selectionEvent in STANDARD_SELECTION_EVENTS: - commandButton.bind('<%s>' % selectionEvent, handler) - + commandButton.bind("<%s>" % selectionEvent, handler) # ------------------ cancel button ------------------------------- cancelButton = tk.Button(buttonsFrame, takefocus=1, text=CANCEL_TEXT) _bindArrows(cancelButton) - cancelButton.pack(expand=1, side=tk.RIGHT, padx='3m', pady='3m', ipadx='2m', ipady='1m') + cancelButton.pack( + expand=1, side=tk.RIGHT, padx="3m", pady="3m", ipadx="2m", ipady="1m" + ) # for the commandButton, bind activation events to the activation event handler - commandButton = cancelButton + commandButton = cancelButton handler = __enterboxCancel for selectionEvent in STANDARD_SELECTION_EVENTS: - commandButton.bind('<%s>' % selectionEvent, handler) + commandButton.bind("<%s>" % selectionEvent, handler) # ------------------- time for action! ----------------- - entryWidget.focus_force() # put the focus on the entryWidget + entryWidget.focus_force() # put the focus on the entryWidget boxRoot.deiconify() if timeout is not None: boxRoot.after(timeout, timeoutBoxRoot) boxRoot.mainloop() # run it! # -------- after the run has completed ---------------------------------- - if root: root.deiconify() + if root: + root.deiconify() try: boxRoot.destroy() # button_click didn't destroy boxRoot, so we do it now except tk.TclError: @@ -397,7 +431,7 @@ def __enterboxRestore(event): global entryWidget - entryWidget.delete(0,len(entryWidget.get())) + entryWidget.delete(0, len(entryWidget.get())) entryWidget.insert(0, __enterboxDefaultText) @@ -406,6 +440,3 @@ __enterboxText = None boxRoot.quit() - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/src/pymsgbox/_native_win.py new/PyMsgBox-1.0.9/src/pymsgbox/_native_win.py --- old/PyMsgBox-1.0.7/src/pymsgbox/_native_win.py 2019-06-18 07:40:01.000000000 +0200 +++ new/PyMsgBox-1.0.9/src/pymsgbox/_native_win.py 2020-05-12 02:01:33.000000000 +0200 @@ -46,12 +46,21 @@ runningOnPython2 = sys.version_info[0] == 2 if runningOnPython2: messageBoxFunc = ctypes.windll.user32.MessageBoxA -else: # Python 3 functions. +else: # Python 3 functions. messageBoxFunc = ctypes.windll.user32.MessageBoxW -def alert(text='', title='', button=pymsgbox.OK_TEXT, root=None, timeout=None, icon=NO_ICON, _tkinter=False): +def alert( + text="", + title="", + button=pymsgbox.OK_TEXT, + root=None, + timeout=None, + icon=NO_ICON, + _tkinter=False, +): """Displays a simple message box with text and a single OK button. Returns the text of the button clicked on.""" + text = str(text) if (_tkinter) or (timeout is not None) or (button != pymsgbox.OK_TEXT): # Timeouts are not supported by Windows message boxes. # Call the original tkinter alert function, not this native one: @@ -60,8 +69,18 @@ messageBoxFunc(0, text, title, MB_OK | MB_SETFOREGROUND | MB_TOPMOST | icon) return button -def confirm(text='', title='', buttons=(pymsgbox.OK_TEXT, pymsgbox.CANCEL_TEXT), root=None, timeout=None, icon=QUESTION, _tkinter=False): + +def confirm( + text="", + title="", + buttons=(pymsgbox.OK_TEXT, pymsgbox.CANCEL_TEXT), + root=None, + timeout=None, + icon=QUESTION, + _tkinter=False, +): """Displays a message box with OK and Cancel buttons. Number and text of buttons can be customized. Returns the text of the button clicked on.""" + text = str(text) buttonFlag = None if len(buttons) == 1: if buttons[0] == pymsgbox.OK_TEXT: @@ -74,18 +93,32 @@ elif buttons[0] == pymsgbox.RETRY_TEXT and buttons[1] == pymsgbox.CANCEL_TEXT: buttonFlag = MB_RETRYCANCEL elif len(buttons) == 3: - if buttons[0] == pymsgbox.ABORT_TEXT and buttons[1] == pymsgbox.RETRY_TEXT and buttons[2] == pymsgbox.IGNORE_TEXT: + if ( + buttons[0] == pymsgbox.ABORT_TEXT + and buttons[1] == pymsgbox.RETRY_TEXT + and buttons[2] == pymsgbox.IGNORE_TEXT + ): buttonFlag = MB_ABORTRETRYIGNORE - elif buttons[0] == pymsgbox.CANCEL_TEXT and buttons[1] == pymsgbox.TRY_AGAIN_TEXT and buttons[2] == pymsgbox.CONTINUE_TEXT: + elif ( + buttons[0] == pymsgbox.CANCEL_TEXT + and buttons[1] == pymsgbox.TRY_AGAIN_TEXT + and buttons[2] == pymsgbox.CONTINUE_TEXT + ): buttonFlag = MB_CANCELTRYCONTINUE - elif buttons[0] == pymsgbox.YES_TEXT and buttons[1] == pymsgbox.NO_TEXT and buttons[2] == pymsgbox.CANCEL_TEXT: + elif ( + buttons[0] == pymsgbox.YES_TEXT + and buttons[1] == pymsgbox.NO_TEXT + and buttons[2] == pymsgbox.CANCEL_TEXT + ): buttonFlag = MB_YESNOCANCEL if (_tkinter) or (timeout is not None) or (buttonFlag is None): # Call the original tkinter confirm() function, not this native one: return pymsgbox._confirmTkinter(text, title, buttons, root, timeout) - retVal = messageBoxFunc(0, text, title, buttonFlag | MB_SETFOREGROUND | MB_TOPMOST | icon) + retVal = messageBoxFunc( + 0, text, title, buttonFlag | MB_SETFOREGROUND | MB_TOPMOST | icon + ) if retVal == IDOK or len(buttons) == 1: return pymsgbox.OK_TEXT elif retVal == IDCANCEL: @@ -105,8 +138,7 @@ elif retVal == IDABORT: return pymsgbox.ABORT_TEXT else: - assert False, 'Unexpected return value from MessageBox: %s' % (retVal) - + assert False, "Unexpected return value from MessageBox: %s" % (retVal) ''' @@ -118,4 +150,4 @@ """Displays a message box with text input, and OK & Cancel buttons. Typed characters appear as *. Returns the text entered, or None if Cancel was clicked.""" pass -''' \ No newline at end of file +''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyMsgBox-1.0.7/tests/test_pymsgbox.py new/PyMsgBox-1.0.9/tests/test_pymsgbox.py --- old/PyMsgBox-1.0.7/tests/test_pymsgbox.py 2019-06-18 07:46:28.000000000 +0200 +++ new/PyMsgBox-1.0.9/tests/test_pymsgbox.py 2020-10-11 03:49:27.000000000 +0200 @@ -5,7 +5,6 @@ import threading import inspect -sys.path.insert(0, os.path.abspath('..')) import pymsgbox # Note: Yes, PyAutoGUI does have PyMsgBox itself as a dependency, but we won't be using that part of PyAutoGUI for this testing. @@ -13,7 +12,7 @@ pyautogui.PAUSE = 0.1 -GUI_WAIT = 0.2 # if tests start failing, maybe try bumping this up a bit (though that'll slow the tests down) +GUI_WAIT = 0.4 # if tests start failing, maybe try bumping this up a bit (though that'll slow the tests down) """

1 0

commit python-PyScreeze for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyScreeze for openSUSE:Factory checked in at 2022-08-30 14:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyScreeze (Old) and /work/SRC/openSUSE:Factory/.python-PyScreeze.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyScreeze" Tue Aug 30 14:50:34 2022 rev:9 rq:1000173 version:0.1.28 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyScreeze/python-PyScreeze.changes 2020-01-16 18:21:28.416982713 +0100 +++ /work/SRC/openSUSE:Factory/.python-PyScreeze.new.2083/python-PyScreeze.changes 2022-08-30 14:51:21.148407094 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 02:58:53 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam(a)suse.com> + +- update to 0.1.28 + * Fix for DC Release error that happened when calling pixel() + after calling screenshot() on Windows. + +------------------------------------------------------------------- Old: ---- PyScreeze-0.1.26.tar.gz New: ---- PyScreeze-0.1.28.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyScreeze.spec ++++++ --- /var/tmp/diff_new_pack.jb0bnY/_old 2022-08-30 14:51:21.784408718 +0200 +++ /var/tmp/diff_new_pack.jb0bnY/_new 2022-08-30 14:51:21.788408727 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-PyScreeze # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-PyScreeze -Version: 0.1.26 +Version: 0.1.28 Release: 0 Summary: A screenshot Python module License: BSD-3-Clause ++++++ PyScreeze-0.1.26.tar.gz -> PyScreeze-0.1.28.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/AUTHORS.txt new/PyScreeze-0.1.28/AUTHORS.txt --- old/PyScreeze-0.1.26/AUTHORS.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/PyScreeze-0.1.28/AUTHORS.txt 2021-09-14 06:08:55.000000000 +0200 @@ -0,0 +1,21 @@ +Here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS -- +people who have submitted patches, reported bugs, added translations, helped +answer newbie questions, and generally made PyScreeze that much better: + +Al Sweigart https://github.com/asweigart +Aneesh Kumar https://github.com/anush0247 +anolir https://github.com/anolir +Ari Lacenski https://github.com/tensory +Brian Redmond https://github.com/bredmond +Christopher Valles https://github.com/christophervalles +Davee Nguyen https://github.com/daveenguyen +David O'Gwynn https://github.com/dogwynn +ijknabla https://github.com/ijknabla +Jeremy R. Gray https://github.com/jeremygray +John Hendy https://github.com/jwhendy +Jon Winsley https://github.com/glitchassassin +Julien Schueller https://github.com/jschueller +Lauritz Thaulow https://github.com/LauritzThaulow +Rob Putt https://github.com/robputt796 +vorstrelok https://github.com/vorstrelok +zerocewl https://github.com/zerocewl \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/PKG-INFO new/PyScreeze-0.1.28/PKG-INFO --- old/PyScreeze-0.1.26/PKG-INFO 2020-01-14 07:57:11.000000000 +0100 +++ new/PyScreeze-0.1.28/PKG-INFO 2021-09-14 06:14:02.495906600 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyScreeze -Version: 0.1.26 +Version: 0.1.28 Summary: A simple, cross-platform screenshot module for Python 2 and 3. Home-page: https://github.com/asweigart/pyscreeze Author: Al Sweigart @@ -132,6 +132,11 @@ >>> pyscreeze.pixelMatchesColor(100, 200, (140, 125, 134), tolerance=10) True + Support + ------- + + If you find this project helpful and would like to support its development, [consider donating to its creator on Patreon](https://www.patreon.com/AlSweigart). + Keywords: screenshot screen screencap capture scrot screencapture image Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/PyScreeze.egg-info/PKG-INFO new/PyScreeze-0.1.28/PyScreeze.egg-info/PKG-INFO --- old/PyScreeze-0.1.26/PyScreeze.egg-info/PKG-INFO 2020-01-14 07:57:11.000000000 +0100 +++ new/PyScreeze-0.1.28/PyScreeze.egg-info/PKG-INFO 2021-09-14 06:14:01.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PyScreeze -Version: 0.1.26 +Version: 0.1.28 Summary: A simple, cross-platform screenshot module for Python 2 and 3. Home-page: https://github.com/asweigart/pyscreeze Author: Al Sweigart @@ -132,6 +132,11 @@ >>> pyscreeze.pixelMatchesColor(100, 200, (140, 125, 134), tolerance=10) True + Support + ------- + + If you find this project helpful and would like to support its development, [consider donating to its creator on Patreon](https://www.patreon.com/AlSweigart). + Keywords: screenshot screen screencap capture scrot screencapture image Platform: UNKNOWN Classifier: Development Status :: 4 - Beta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/PyScreeze.egg-info/SOURCES.txt new/PyScreeze-0.1.28/PyScreeze.egg-info/SOURCES.txt --- old/PyScreeze-0.1.26/PyScreeze.egg-info/SOURCES.txt 2020-01-14 07:57:11.000000000 +0100 +++ new/PyScreeze-0.1.28/PyScreeze.egg-info/SOURCES.txt 2021-09-14 06:14:01.000000000 +0200 @@ -1,7 +1,9 @@ +AUTHORS.txt LICENSE.txt MANIFEST.in README.md README.rst +pyproject.toml setup.py PyScreeze.egg-info/PKG-INFO PyScreeze.egg-info/SOURCES.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/README.md new/PyScreeze-0.1.28/README.md --- old/PyScreeze-0.1.26/README.md 2017-01-20 00:25:53.000000000 +0100 +++ new/PyScreeze-0.1.28/README.md 2021-09-01 23:18:20.000000000 +0200 @@ -123,3 +123,8 @@ False >>> pyscreeze.pixelMatchesColor(100, 200, (140, 125, 134), tolerance=10) True + +Support +------- + +If you find this project helpful and would like to support its development, [consider donating to its creator on Patreon](https://www.patreon.com/AlSweigart). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/docs/screenshot.rst new/PyScreeze-0.1.28/docs/screenshot.rst --- old/PyScreeze-0.1.26/docs/screenshot.rst 2014-12-11 20:00:35.000000000 +0100 +++ new/PyScreeze-0.1.28/docs/screenshot.rst 2021-04-18 06:00:07.000000000 +0200 @@ -86,6 +86,8 @@ >>> list(pyautogui.locateAllOnScreen('someButton.png')) [(1101, 252, 50, 50), (59, 481, 50, 50), (1395, 640, 50, 50), (1838, 676, 50, 50)] +- `locateOnScreen(image, title)` - Returns (left, top, width, height) coordinate of first found instance of the `image` on the window with `title` in its title. Returns None if not found on the screen. This function requires the PyGetWindow module to be installed. + Grayscale Matching ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/pyproject.toml new/PyScreeze-0.1.28/pyproject.toml --- old/PyScreeze-0.1.26/pyproject.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/PyScreeze-0.1.28/pyproject.toml 2020-10-11 03:59:51.000000000 +0200 @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta:__legacy__" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyScreeze-0.1.26/pyscreeze/__init__.py new/PyScreeze-0.1.28/pyscreeze/__init__.py --- old/PyScreeze-0.1.26/pyscreeze/__init__.py 2020-01-14 07:55:42.000000000 +0100 +++ new/PyScreeze-0.1.28/pyscreeze/__init__.py 2021-09-14 06:11:04.000000000 +0200 @@ -8,7 +8,7 @@ http://ubuntuforums.org/showthread.php?t=1751455 """ -__version__ = '0.1.26' +__version__ = '0.1.28' import collections import datetime @@ -70,6 +70,15 @@ except AttributeError: pass # Windows XP doesn't support monitor scaling, so just do nothing. + try: + import pygetwindow + except ImportError: + _PYGETWINDOW_UNAVAILABLE = True + else: + _PYGETWINDOW_UNAVAILABLE = False +else: + _PYGETWINDOW_UNAVAILABLE = True + GRAYSCALE_DEFAULT = False @@ -109,6 +118,7 @@ try: yield hDC finally: + windll.user32.ReleaseDC.argtypes = [ctypes.c_ssize_t, ctypes.c_ssize_t] if windll.user32.ReleaseDC(hWnd, hDC) == 0: raise WindowsError("windll.user32.ReleaseDC failed : return 0") @@ -235,10 +245,13 @@ # TODO - We should consider renaming _locateAll_python to _locateAll_pillow, since Pillow is the real dependency. @requiresPillow -def _locateAll_python(needleImage, haystackImage, grayscale=None, limit=None, region=None, step=1): +def _locateAll_python(needleImage, haystackImage, grayscale=None, limit=None, region=None, step=1, confidence=None): """ TODO """ + if confidence is not None: + raise NotImplementedError('The confidence keyword argument is only available if OpenCV is installed.') + # setup all the arguments if grayscale is None: grayscale = GRAYSCALE_DEFAULT @@ -403,6 +416,23 @@ else: return center(coords) +def locateOnWindow(image, title, **kwargs): + """ + TODO + """ + if _PYGETWINDOW_UNAVAILABLE: + raise PyScreezeException('locateOnWindow() failed because PyGetWindow is not installed or is unsupported on this platform.') + + matchingWindows = pygetwindow.getWindowsWithTitle(title) + if len(matchingWindows) == 0: + raise PyScreezeException('Could not find a window with %s in the title' % (title)) + elif len(matchingWindows) > 1: + raise PyScreezeException('Found multiple windows with %s in the title: %s' % (title, [str(win) for win in matchingWindows])) + + win = matchingWindows[0] + win.activate() + return locateOnScreen(image, region=(win.left, win.top, win.width, win.height), **kwargs) + @requiresPillow def showRegionOnScreen(region, outlineColor='red', filename='_showRegionOnScreen.png'):

1 0

commit mingw64-gcc for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw64-gcc for openSUSE:Factory checked in at 2022-08-30 14:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw64-gcc (Old) and /work/SRC/openSUSE:Factory/.mingw64-gcc.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw64-gcc" Tue Aug 30 14:50:25 2022 rev:10 rq:1000168 version:12.2.0 Changes: -------- mingw64-cross-gcc.changes: same change --- /work/SRC/openSUSE:Factory/mingw64-gcc/mingw64-gcc.changes 2022-08-27 11:50:02.801837481 +0200 +++ /work/SRC/openSUSE:Factory/.mingw64-gcc.new.2083/mingw64-gcc.changes 2022-08-30 14:51:18.760401002 +0200 @@ -13,0 +14,5 @@ +Thu Aug 25 08:10:09 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to version 12.2.0 + +------------------------------------------------------------------- Old: ---- gcc-12.1.0.tar.xz New: ---- gcc-12.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw64-cross-gcc-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.NHAFnd/_old 2022-08-30 14:51:19.496402879 +0200 +++ /var/tmp/diff_new_pack.NHAFnd/_new 2022-08-30 14:51:19.500402890 +0200 @@ -24,7 +24,7 @@ %define __os_install_post %{_prefix}/lib/rpm/brp-compress %{nil} Name: mingw64-cross-gcc-bootstrap -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows cross-compiler (GCC) for C License: GPL-3.0-or-later ++++++ mingw64-cross-gcc.spec ++++++ --- /var/tmp/diff_new_pack.NHAFnd/_old 2022-08-30 14:51:19.528402961 +0200 +++ /var/tmp/diff_new_pack.NHAFnd/_new 2022-08-30 14:51:19.532402971 +0200 @@ -25,7 +25,7 @@ %define __os_install_post %{_prefix}/lib/rpm/brp-compress %{nil} %define include_ada 0 Name: mingw64-cross-gcc -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows cross-compiler (GCC) for C License: GPL-3.0-or-later ++++++ mingw64-gcc.spec ++++++ --- /var/tmp/diff_new_pack.NHAFnd/_old 2022-08-30 14:51:19.560403043 +0200 +++ /var/tmp/diff_new_pack.NHAFnd/_new 2022-08-30 14:51:19.568403063 +0200 @@ -19,7 +19,7 @@ %define include_ada 0 %_mingw64_package_header_debug Name: mingw64-gcc -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows compiler (GCC) for C License: GPL-3.0-or-later ++++++ gcc-12.1.0.tar.xz -> gcc-12.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/mingw64-gcc/gcc-12.1.0.tar.xz /work/SRC/openSUSE:Factory/.mingw64-gcc.new.2083/gcc-12.2.0.tar.xz differ: char 25, line 1

1 0

commit mingw64-binutils for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw64-binutils for openSUSE:Factory checked in at 2022-08-30 14:50:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw64-binutils (Old) and /work/SRC/openSUSE:Factory/.mingw64-binutils.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw64-binutils" Tue Aug 30 14:50:24 2022 rev:4 rq:1000167 version:2.39 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw64-binutils/mingw64-binutils.changes 2022-07-11 19:11:17.703773943 +0200 +++ /work/SRC/openSUSE:Factory/.mingw64-binutils.new.2083/mingw64-binutils.changes 2022-08-30 14:51:17.088396735 +0200 @@ -1,0 +2,8 @@ +Mon Aug 22 14:08:05 UTC 2022 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Update to version 2.39 +- Add patch to fix memory leak in objdump bug, see + https://sourceware.org/bugzilla/show_bug.cgi?id=29505 for details + * 0001-PR29362-some-binutils-memory-leaks.patch + +------------------------------------------------------------------- mingw64-cross-binutils.changes: same change Old: ---- binutils-2.38.tar.xz New: ---- 0001-PR29362-some-binutils-memory-leaks.patch binutils-2.39.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw64-binutils.spec ++++++ --- /var/tmp/diff_new_pack.zgc26Z/_old 2022-08-30 14:51:17.704398307 +0200 +++ /var/tmp/diff_new_pack.zgc26Z/_new 2022-08-30 14:51:17.712398327 +0200 @@ -17,7 +17,7 @@ Name: mingw64-binutils -Version: 2.38 +Version: 2.39 Release: 0 Summary: GNU Binutils License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later @@ -25,6 +25,7 @@ URL: http://www.gnu.org/software/binutils/ Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz Source99: mingw64-binutils-rpmlintrc +Patch0: 0001-PR29362-some-binutils-memory-leaks.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex ++++++ mingw64-cross-binutils.spec ++++++ --- /var/tmp/diff_new_pack.zgc26Z/_old 2022-08-30 14:51:17.736398388 +0200 +++ /var/tmp/diff_new_pack.zgc26Z/_new 2022-08-30 14:51:17.744398409 +0200 @@ -17,13 +17,14 @@ Name: mingw64-cross-binutils -Version: 2.38 +Version: 2.39 Release: 0 Summary: GNU Binutils License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz +Patch0: 0001-PR29362-some-binutils-memory-leaks.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex ++++++ 0001-PR29362-some-binutils-memory-leaks.patch ++++++ From 450da4bd38ae529a6879baafe59b1e88507b5fd9 Mon Sep 17 00:00:00 2001 From: Alan Modra <amodra(a)gmail.com> Date: Tue, 16 Aug 2022 00:16:49 +0930 Subject: [PATCH] PR29362, some binutils memory leaks 2022-08-16 Alan Modra <amodra(a)gmail.com> Cunlong Li <shenxiaogll(a)163.com> PR 29362 * dwarf.c (free_debug_information): New function, extracted.. (free_debug_memory): ..from here. (process_debug_info): Use it when before clearing out unit debug_information. Clear all fields. * objcopy.c (delete_symbol_htabs): New function. (main): Call it via xatexit. (copy_archive): Free "dir". * objdump.c (free_debug_section): Free reloc_info. --- binutils/dwarf.c | 52 +++++++++++++++++++++------------------------- binutils/objcopy.c | 16 ++++++++++++++ binutils/objdump.c | 3 +++ 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 09220978380..71d8bc9ed5c 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -3509,6 +3509,21 @@ introduce (struct dwarf_section * section, bool raw) } } +/* Free memory allocated for one unit in debug_information. */ + +static void +free_debug_information (debug_info *ent) +{ + if (ent->max_loc_offsets) + { + free (ent->loc_offsets); + free (ent->loc_views); + free (ent->have_frame_base); + } + if (ent->max_range_lists) + free (ent->range_lists); +} + /* Process the contents of a .debug_info section. If do_loc is TRUE then we are scanning for location lists and dwo tags and we do not want to display anything to the user. @@ -3805,25 +3820,14 @@ process_debug_info (struct dwarf_section * section, && alloc_num_debug_info_entries > unit && ! do_types) { - debug_information [unit].cu_offset = cu_offset; - debug_information [unit].pointer_size - = compunit.cu_pointer_size; - debug_information [unit].offset_size = offset_size; - debug_information [unit].dwarf_version = compunit.cu_version; - debug_information [unit].base_address = 0; - debug_information [unit].addr_base = DEBUG_INFO_UNAVAILABLE; - debug_information [unit].ranges_base = DEBUG_INFO_UNAVAILABLE; - debug_information [unit].rnglists_base = 0; - debug_information [unit].loc_offsets = NULL; - debug_information [unit].have_frame_base = NULL; - debug_information [unit].max_loc_offsets = 0; - debug_information [unit].num_loc_offsets = 0; - debug_information [unit].loclists_base = 0; - debug_information [unit].range_lists = NULL; - debug_information [unit].max_range_lists= 0; - debug_information [unit].num_range_lists = 0; - debug_information [unit].rnglists_base = 0; - debug_information [unit].str_offsets_base = 0; + free_debug_information (&debug_information[unit]); + memset (&debug_information[unit], 0, sizeof (*debug_information)); + debug_information[unit].pointer_size = compunit.cu_pointer_size; + debug_information[unit].offset_size = offset_size; + debug_information[unit].dwarf_version = compunit.cu_version; + debug_information[unit].cu_offset = cu_offset; + debug_information[unit].addr_base = DEBUG_INFO_UNAVAILABLE; + debug_information[unit].ranges_base = DEBUG_INFO_UNAVAILABLE; } if (!do_loc && dwarf_start_die == 0) @@ -12021,15 +12025,7 @@ free_debug_memory (void) if (debug_information != NULL) { for (i = 0; i < alloc_num_debug_info_entries; i++) - { - if (debug_information [i].max_loc_offsets) - { - free (debug_information [i].loc_offsets); - free (debug_information [i].have_frame_base); - } - if (debug_information [i].max_range_lists) - free (debug_information [i].range_lists); - } + free_debug_information (&debug_information[i]); free (debug_information); debug_information = NULL; alloc_num_debug_info_entries = num_debug_info_entries = 0; diff --git a/binutils/objcopy.c b/binutils/objcopy.c index b907b02d5e7..1118a2256a4 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -1048,6 +1048,20 @@ create_symbol_htabs (void) redefine_specific_reverse_htab = create_symbol_htab (); } +static void +delete_symbol_htabs (void) +{ + htab_delete (strip_specific_htab); + htab_delete (strip_unneeded_htab); + htab_delete (keep_specific_htab); + htab_delete (localize_specific_htab); + htab_delete (globalize_specific_htab); + htab_delete (keepglobal_specific_htab); + htab_delete (weaken_specific_htab); + htab_delete (redefine_specific_htab); + htab_delete (redefine_specific_reverse_htab); +} + /* Add a symbol to strip_specific_list. */ static void @@ -3736,6 +3750,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, } rmdir (dir); + free (dir); } static void @@ -6016,6 +6031,7 @@ main (int argc, char *argv[]) } create_symbol_htabs (); + xatexit (delete_symbol_htabs); if (argv != NULL) bfd_set_error_program_name (argv[0]); diff --git a/binutils/objdump.c b/binutils/objdump.c index 188c286e294..b34df5392b9 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4108,6 +4108,9 @@ free_debug_section (enum dwarf_section_display_enum debug) section->start = NULL; section->address = 0; section->size = 0; + free ((char*) section->reloc_info); + section->reloc_info = NULL; + section->num_relocs= 0; } void -- 2.35.3 ++++++ binutils-2.38.tar.xz -> binutils-2.39.tar.xz ++++++ /work/SRC/openSUSE:Factory/mingw64-binutils/binutils-2.38.tar.xz /work/SRC/openSUSE:Factory/.mingw64-binutils.new.2083/binutils-2.39.tar.xz differ: char 25, line 1

1 0

commit mingw64-filesystem for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw64-filesystem for openSUSE:Factory checked in at 2022-08-30 14:50:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw64-filesystem (Old) and /work/SRC/openSUSE:Factory/.mingw64-filesystem.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw64-filesystem" Tue Aug 30 14:50:23 2022 rev:21 rq:1000166 version:20220826 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw64-filesystem/mingw64-filesystem.changes 2022-08-27 11:50:01.629834963 +0200 +++ /work/SRC/openSUSE:Factory/.mingw64-filesystem.new.2083/mingw64-filesystem.changes 2022-08-30 14:51:15.820393499 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 10:17:22 UTC 2022 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Fix generating invalid source file path when scanning binaries + (boo#1202865) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw-objdump-srcfiles ++++++ --- /var/tmp/diff_new_pack.Tgnzp6/_old 2022-08-30 14:51:16.528395306 +0200 +++ /var/tmp/diff_new_pack.Tgnzp6/_new 2022-08-30 14:51:16.536395327 +0200 @@ -15,7 +15,11 @@ state == 1 && $2 ~ /DW_AT_comp_dir/ { atdir = $NF - if (atdir != "" && atname != "") { + # atname is absolute + if (atname ~ /^\//) { + print atname + state = 0 + } else if (atdir != "" && atname != "") { print atdir "/" atname state = 0 }

1 0

commit mingw32-gcc for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw32-gcc for openSUSE:Factory checked in at 2022-08-30 14:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw32-gcc (Old) and /work/SRC/openSUSE:Factory/.mingw32-gcc.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw32-gcc" Tue Aug 30 14:50:20 2022 rev:10 rq:1000165 version:12.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw32-gcc/mingw32-cross-gcc-bootstrap.changes 2022-07-08 14:01:41.378432414 +0200 +++ /work/SRC/openSUSE:Factory/.mingw32-gcc.new.2083/mingw32-cross-gcc-bootstrap.changes 2022-08-30 14:51:12.652385416 +0200 @@ -1,0 +2,5 @@ +Wed Aug 24 11:13:06 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to version 12.2.0 + +------------------------------------------------------------------- mingw32-cross-gcc.changes: same change mingw32-gcc.changes: same change Old: ---- gcc-12.1.0.tar.xz New: ---- gcc-12.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw32-cross-gcc-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.yJ3Ljs/_old 2022-08-30 14:51:15.488392653 +0200 +++ /var/tmp/diff_new_pack.yJ3Ljs/_new 2022-08-30 14:51:15.492392662 +0200 @@ -24,7 +24,7 @@ %define __os_install_post %{_prefix}/lib/rpm/brp-compress %{nil} Name: mingw32-cross-gcc-bootstrap -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows cross-compiler (GCC) for C License: GPL-3.0-or-later ++++++ mingw32-cross-gcc.spec ++++++ --- /var/tmp/diff_new_pack.yJ3Ljs/_old 2022-08-30 14:51:15.520392734 +0200 +++ /var/tmp/diff_new_pack.yJ3Ljs/_new 2022-08-30 14:51:15.524392745 +0200 @@ -25,7 +25,7 @@ %define __os_install_post %{_prefix}/lib/rpm/brp-compress %{nil} %define include_ada 0 Name: mingw32-cross-gcc -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows cross-compiler (GCC) for C License: GPL-3.0-or-later ++++++ mingw32-gcc.spec ++++++ --- /var/tmp/diff_new_pack.yJ3Ljs/_old 2022-08-30 14:51:15.556392826 +0200 +++ /var/tmp/diff_new_pack.yJ3Ljs/_new 2022-08-30 14:51:15.564392847 +0200 @@ -19,7 +19,7 @@ %define include_ada 0 %_mingw32_package_header_debug Name: mingw32-gcc -Version: 12.1.0 +Version: 12.2.0 Release: 0 Summary: MinGW Windows compiler (GCC) for C License: GPL-3.0-or-later ++++++ gcc-12.1.0.tar.xz -> gcc-12.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/mingw32-gcc/gcc-12.1.0.tar.xz /work/SRC/openSUSE:Factory/.mingw32-gcc.new.2083/gcc-12.2.0.tar.xz differ: char 25, line 1

1 0

commit mingw32-binutils for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw32-binutils for openSUSE:Factory checked in at 2022-08-30 14:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw32-binutils (Old) and /work/SRC/openSUSE:Factory/.mingw32-binutils.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw32-binutils" Tue Aug 30 14:50:18 2022 rev:4 rq:1000163 version:2.39 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw32-binutils/mingw32-binutils.changes 2022-07-11 19:11:16.843772696 +0200 +++ /work/SRC/openSUSE:Factory/.mingw32-binutils.new.2083/mingw32-binutils.changes 2022-08-30 14:51:10.820380742 +0200 @@ -1,0 +2,8 @@ +Mon Aug 22 14:08:05 UTC 2022 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Update to version 2.39 +- Add patch to fix memory leak in objdump bug, see + https://sourceware.org/bugzilla/show_bug.cgi?id=29505 for details + * 0001-PR29362-some-binutils-memory-leaks.patch + +------------------------------------------------------------------- mingw32-cross-binutils.changes: same change Old: ---- binutils-2.38.tar.xz New: ---- 0001-PR29362-some-binutils-memory-leaks.patch binutils-2.39.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw32-binutils.spec ++++++ --- /var/tmp/diff_new_pack.YzwvW9/_old 2022-08-30 14:51:11.520382527 +0200 +++ /var/tmp/diff_new_pack.YzwvW9/_new 2022-08-30 14:51:11.528382548 +0200 @@ -17,7 +17,7 @@ Name: mingw32-binutils -Version: 2.38 +Version: 2.39 Release: 0 Summary: GNU Binutils License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later @@ -25,6 +25,7 @@ URL: http://www.gnu.org/software/binutils/ Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz Source99: mingw32-binutils-rpmlintrc +Patch0: 0001-PR29362-some-binutils-memory-leaks.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex ++++++ mingw32-cross-binutils.spec ++++++ --- /var/tmp/diff_new_pack.YzwvW9/_old 2022-08-30 14:51:11.556382619 +0200 +++ /var/tmp/diff_new_pack.YzwvW9/_new 2022-08-30 14:51:11.560382629 +0200 @@ -17,13 +17,14 @@ Name: mingw32-cross-binutils -Version: 2.38 +Version: 2.39 Release: 0 Summary: GNU Binutils License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later Group: Development/Libraries URL: http://www.gnu.org/software/binutils/ Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz +Patch0: 0001-PR29362-some-binutils-memory-leaks.patch #!BuildIgnore: post-build-checks BuildRequires: bison BuildRequires: flex ++++++ 0001-PR29362-some-binutils-memory-leaks.patch ++++++ From 450da4bd38ae529a6879baafe59b1e88507b5fd9 Mon Sep 17 00:00:00 2001 From: Alan Modra <amodra(a)gmail.com> Date: Tue, 16 Aug 2022 00:16:49 +0930 Subject: [PATCH] PR29362, some binutils memory leaks 2022-08-16 Alan Modra <amodra(a)gmail.com> Cunlong Li <shenxiaogll(a)163.com> PR 29362 * dwarf.c (free_debug_information): New function, extracted.. (free_debug_memory): ..from here. (process_debug_info): Use it when before clearing out unit debug_information. Clear all fields. * objcopy.c (delete_symbol_htabs): New function. (main): Call it via xatexit. (copy_archive): Free "dir". * objdump.c (free_debug_section): Free reloc_info. --- binutils/dwarf.c | 52 +++++++++++++++++++++------------------------- binutils/objcopy.c | 16 ++++++++++++++ binutils/objdump.c | 3 +++ 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 09220978380..71d8bc9ed5c 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -3509,6 +3509,21 @@ introduce (struct dwarf_section * section, bool raw) } } +/* Free memory allocated for one unit in debug_information. */ + +static void +free_debug_information (debug_info *ent) +{ + if (ent->max_loc_offsets) + { + free (ent->loc_offsets); + free (ent->loc_views); + free (ent->have_frame_base); + } + if (ent->max_range_lists) + free (ent->range_lists); +} + /* Process the contents of a .debug_info section. If do_loc is TRUE then we are scanning for location lists and dwo tags and we do not want to display anything to the user. @@ -3805,25 +3820,14 @@ process_debug_info (struct dwarf_section * section, && alloc_num_debug_info_entries > unit && ! do_types) { - debug_information [unit].cu_offset = cu_offset; - debug_information [unit].pointer_size - = compunit.cu_pointer_size; - debug_information [unit].offset_size = offset_size; - debug_information [unit].dwarf_version = compunit.cu_version; - debug_information [unit].base_address = 0; - debug_information [unit].addr_base = DEBUG_INFO_UNAVAILABLE; - debug_information [unit].ranges_base = DEBUG_INFO_UNAVAILABLE; - debug_information [unit].rnglists_base = 0; - debug_information [unit].loc_offsets = NULL; - debug_information [unit].have_frame_base = NULL; - debug_information [unit].max_loc_offsets = 0; - debug_information [unit].num_loc_offsets = 0; - debug_information [unit].loclists_base = 0; - debug_information [unit].range_lists = NULL; - debug_information [unit].max_range_lists= 0; - debug_information [unit].num_range_lists = 0; - debug_information [unit].rnglists_base = 0; - debug_information [unit].str_offsets_base = 0; + free_debug_information (&debug_information[unit]); + memset (&debug_information[unit], 0, sizeof (*debug_information)); + debug_information[unit].pointer_size = compunit.cu_pointer_size; + debug_information[unit].offset_size = offset_size; + debug_information[unit].dwarf_version = compunit.cu_version; + debug_information[unit].cu_offset = cu_offset; + debug_information[unit].addr_base = DEBUG_INFO_UNAVAILABLE; + debug_information[unit].ranges_base = DEBUG_INFO_UNAVAILABLE; } if (!do_loc && dwarf_start_die == 0) @@ -12021,15 +12025,7 @@ free_debug_memory (void) if (debug_information != NULL) { for (i = 0; i < alloc_num_debug_info_entries; i++) - { - if (debug_information [i].max_loc_offsets) - { - free (debug_information [i].loc_offsets); - free (debug_information [i].have_frame_base); - } - if (debug_information [i].max_range_lists) - free (debug_information [i].range_lists); - } + free_debug_information (&debug_information[i]); free (debug_information); debug_information = NULL; alloc_num_debug_info_entries = num_debug_info_entries = 0; diff --git a/binutils/objcopy.c b/binutils/objcopy.c index b907b02d5e7..1118a2256a4 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -1048,6 +1048,20 @@ create_symbol_htabs (void) redefine_specific_reverse_htab = create_symbol_htab (); } +static void +delete_symbol_htabs (void) +{ + htab_delete (strip_specific_htab); + htab_delete (strip_unneeded_htab); + htab_delete (keep_specific_htab); + htab_delete (localize_specific_htab); + htab_delete (globalize_specific_htab); + htab_delete (keepglobal_specific_htab); + htab_delete (weaken_specific_htab); + htab_delete (redefine_specific_htab); + htab_delete (redefine_specific_reverse_htab); +} + /* Add a symbol to strip_specific_list. */ static void @@ -3736,6 +3750,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, } rmdir (dir); + free (dir); } static void @@ -6016,6 +6031,7 @@ main (int argc, char *argv[]) } create_symbol_htabs (); + xatexit (delete_symbol_htabs); if (argv != NULL) bfd_set_error_program_name (argv[0]); diff --git a/binutils/objdump.c b/binutils/objdump.c index 188c286e294..b34df5392b9 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4108,6 +4108,9 @@ free_debug_section (enum dwarf_section_display_enum debug) section->start = NULL; section->address = 0; section->size = 0; + free ((char*) section->reloc_info); + section->reloc_info = NULL; + section->num_relocs= 0; } void -- 2.35.3 ++++++ binutils-2.38.tar.xz -> binutils-2.39.tar.xz ++++++ /work/SRC/openSUSE:Factory/mingw32-binutils/binutils-2.38.tar.xz /work/SRC/openSUSE:Factory/.mingw32-binutils.new.2083/binutils-2.39.tar.xz differ: char 25, line 1

1 0

commit mingw32-filesystem for openSUSE:Factory
by Source-Sync 30 Aug '22

30 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw32-filesystem for openSUSE:Factory checked in at 2022-08-30 14:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw32-filesystem (Old) and /work/SRC/openSUSE:Factory/.mingw32-filesystem.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mingw32-filesystem" Tue Aug 30 14:50:18 2022 rev:21 rq:1000161 version:20220826 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw32-filesystem/mingw32-filesystem.changes 2022-08-27 11:49:59.437830254 +0200 +++ /work/SRC/openSUSE:Factory/.mingw32-filesystem.new.2083/mingw32-filesystem.changes 2022-08-30 14:51:09.676377823 +0200 @@ -1,0 +2,6 @@ +Mon Aug 29 10:17:22 UTC 2022 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Fix generating invalid source file path when scanning binaries + (boo#1202865) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw-objdump-srcfiles ++++++ --- /var/tmp/diff_new_pack.izHmEE/_old 2022-08-30 14:51:10.340379517 +0200 +++ /var/tmp/diff_new_pack.izHmEE/_new 2022-08-30 14:51:10.344379526 +0200 @@ -15,7 +15,11 @@ state == 1 && $2 ~ /DW_AT_comp_dir/ { atdir = $NF - if (atdir != "" && atname != "") { + # atname is absolute + if (atname ~ /^\//) { + print atname + state = 0 + } else if (atdir != "" && atname != "") { print atdir "/" atname state = 0 }

1 0