Hello community, here is the log from the commit of package avrdude for openSUSE:Factory checked in at 2014-04-09 13:11:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avrdude (Old) and /work/SRC/openSUSE:Factory/.avrdude.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avrdude" Changes: -------- --- /work/SRC/openSUSE:Factory/avrdude/avrdude.changes 2014-02-12 07:01:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.avrdude.new/avrdude.changes 2014-04-09 13:11:36.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Apr 3 14:23:45 UTC 2014 - peter.tromm...@ohm-hochschule.de + +- include released tarball from upstream +- disable source service +- refresh patch avrdude-5.11-no-builddate.diff + +------------------------------------------------------------------- +Mon Feb 10 15:25:41 UTC 2014 - m...@suse.com + +- Bump version number to 6.1 in _service to reflect upstream. +- Generate udev rules from avrdude-usbdevices, which has a simpler + and easier to maintain format. This also simplifies following + further upstream changes in udev rules syntax. +- IPv6-enable the "-P net:host:port" option (avrdude-ipv6.patch). + +------------------------------------------------------------------- Old: ---- avrdude-5.11svn.1275.tar.gz avrdude-udev.rules New: ---- avrdude-6.1.tar.gz avrdude-ipv6.patch avrdude-usbdevices ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avrdude.spec ++++++ --- /var/tmp/diff_new_pack.5NY5Fk/_old 2014-04-09 13:11:37.000000000 +0200 +++ /var/tmp/diff_new_pack.5NY5Fk/_new 2014-04-09 13:11:37.000000000 +0200 @@ -26,7 +26,7 @@ BuildRequires: libelf-devel BuildRequires: automake BuildRequires: texinfo -Version: 5.11svn.1275 +Version: 6.1 Release: 0 Url: http://savannah.nongnu.org/projects/avrdude Group: Development/Tools/Other @@ -34,8 +34,9 @@ Summary: Upload tool for AVR microcontrollers Source0: %name-%version.tar.gz Source3: modprobe.avrdude_parport -Source4: avrdude-udev.rules +Source4: avrdude-usbdevices Patch0: avrdude-5.11-no-builddate.diff +Patch1: avrdude-ipv6.patch Provides: avr-programmer BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/cat /sbin/modprobe @@ -50,6 +51,7 @@ %setup -q # avrdude-5.11-no-builddate.diff %patch0 -p1 +%patch1 touch lexer.l %build @@ -64,14 +66,23 @@ %makeinstall DOC_INST_DIR=%buildroot%_docdir/%name make -C doc install-info DESTDIR=%buildroot install -D -m 644 %{S:3} $RPM_BUILD_ROOT/etc/modprobe.d/50-avrdude_parport.conf + %if 0%{?suse_version} >= 1230 -%define udevdir /usr/lib/udev -sed -i 's/"udev-acl"/"uaccess"/g' %{S:4} +%global udevdir /usr/lib/udev +%global tag uaccess %else -%define udevdir /etc/udev -sed -i 's/"uaccess"/"udev-acl"/g' %{S:4} +%global udevdir /etc/udev +%global tag udev-acl %endif -install -D -m 644 %{S:4} %buildroot%udevdir/rules.d/50-avrdude.rules +RULESFILE=%buildroot%udevdir/rules.d/50-avrdude.rules +mkdir -p ${RULESFILE%/*} +echo 'KERNEL=="parport*", TAG+="%tag"' > $RULESFILE +while IFS=" " read major minor comment;do + echo "# $comment" + echo 'ATTRS{idVendor}=="'$major'", ATTRS{idProduct}=="'$minor'", TAG+="%tag"' +done <%{S:4} >> $RULESFILE +chmod 644 $RULESFILE + install -d -m 755 %buildroot%_docdir/%name install -m 644 AUTHORS COPYING NEWS README %buildroot%_docdir/%name ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5NY5Fk/_old 2014-04-09 13:11:37.000000000 +0200 +++ /var/tmp/diff_new_pack.5NY5Fk/_new 2014-04-09 13:11:37.000000000 +0200 @@ -1,13 +1,13 @@ <services> - <service name="tar_scm" mode='localonly'> + <service name="tar_scm" mode='disabled'> <param name="scm">svn</param> <param name="url">svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude</param> <param name="filename">avrdude</param> - <param name="versionprefix">5.11svn</param> + <param name="versionprefix">6.1svn</param> </service> - <service name="recompress" mode='localonly'> + <service name="recompress" mode='disabled'> <param name="file">*tar</param> <param name="compression">gz</param> </service> - <service name="set_version" mode='localonly'/> + <service name="set_version" mode='disabled'/> </services> ++++++ avrdude-5.11-no-builddate.diff ++++++ --- /var/tmp/diff_new_pack.5NY5Fk/_old 2014-04-09 13:11:37.000000000 +0200 +++ /var/tmp/diff_new_pack.5NY5Fk/_new 2014-04-09 13:11:37.000000000 +0200 @@ -2,24 +2,20 @@ main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: avrdude-5.11/main.c +Index: avrdude-6.1/main.c =================================================================== ---- avrdude-5.11.orig/main.c -+++ avrdude-5.11/main.c -@@ -563,14 +563,14 @@ int main(int argc, char * argv []) - /* - * Print out an identifying string so folks can tell what version +--- avrdude-6.1.orig/main.c ++++ avrdude-6.1/main.c +@@ -631,10 +631,10 @@ int main(int argc, char * argv []) * they are running */ fprintf(stderr, - "\n%s: Version %s, compiled on %s at %s\n" + "\n%s: Version %s, (openSUSE Buildservice)\n" "%sCopyright (c) 2000-2005 Brian Dean, http://www.bdmicro.com/\n"; - "%sCopyright (c) 2007-2009 Joerg Wunsch\n\n", + "%sCopyright (c) 2007-2014 Joerg Wunsch\n\n", - progname, version, __DATE__, __TIME__, progbuf, progbuf); + progname, version, progbuf, progbuf); } if (verbose) { - fprintf(stderr, "%sSystem wide configuration file is \"%s\"\n", - progbuf, sys_config); ++++++ avrdude-5.11svn.1275.tar.gz -> avrdude-6.1.tar.gz ++++++ ++++ 35539 lines of diff (skipped) ++++++ avrdude-ipv6.patch ++++++ Index: ser_posix.c =================================================================== --- ser_posix.c.orig 2013-09-03 13:05:13.078632000 +0200 +++ ser_posix.c 2014-02-10 18:11:24.519081223 +0100 @@ -160,67 +160,76 @@ static int net_open(const char *port, union filedescriptor *fdp) { - char *hstr, *pstr, *end; - unsigned int pnum; - int fd; - struct sockaddr_in sockaddr; - struct hostent *hp; + char *hp, *hstr, *pstr; + int s, fd, ret = -1; + struct addrinfo hints; + struct addrinfo *result, *rp; - if ((hstr = strdup(port)) == NULL) { + if ((hstr = hp = strdup(port)) == NULL) { fprintf(stderr, "%s: net_open(): Out of memory!\n", progname); return -1; } - if (((pstr = strchr(hstr, ':')) == NULL) || (pstr == hstr)) { + /* + * As numeric IPv6 addresses use colons as separators, we need to + * look for the last colon here, which separates the port number or + * service name from the host or IP address. + */ + if (((pstr = strrchr(hstr, ':')) == NULL) || (pstr == hstr)) { fprintf(stderr, "%s: net_open(): Mangled host:port string \"%s\"\n", progname, hstr); - free(hstr); - return -1; + goto error; } /* - * Terminate the host section of the description. + * Remove brackets from the host part, if present. */ - *pstr++ = '\0'; - - pnum = strtoul(pstr, &end, 10); - - if ((*pstr == '\0') || (*end != '\0') || (pnum == 0) || (pnum > 65535)) { - fprintf(stderr, "%s: net_open(): Bad port number \"%s\"\n", - progname, pstr); - free(hstr); - return -1; - } - - if ((hp = gethostbyname(hstr)) == NULL) { - fprintf(stderr, "%s: net_open(): unknown host \"%s\"\n", - progname, hstr); - free(hstr); - return -1; + if (*hstr == '[' && *(pstr-1) == ']') { + hstr++; + *(pstr-1) = '\0'; } - free(hstr); + /* + * Terminate the host section of the description. + */ + *pstr++ = '\0'; - if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "%s: net_open(): Cannot open socket: %s\n", - progname, strerror(errno)); - return -1; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + s = getaddrinfo(hstr, pstr, &hints, &result); + + if (s != 0) { + fprintf(stderr, "%s: net_open(): Cannot resolve host=\"%s\", port=\"%s\": %s\n", + progname, hstr, pstr, gai_strerror(s)); + goto error; + } + for (rp = result; rp != NULL; rp = rp->ai_next) { + fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (fd == -1) { + /* This one failed, loop over */ + continue; + } + if (connect(fd, rp->ai_addr, rp->ai_addrlen) != -1) { + /* Success, we are connected */ + break; + } + close(fd); } - - memset(&sockaddr, 0, sizeof(struct sockaddr_in)); - sockaddr.sin_family = AF_INET; - sockaddr.sin_port = htons(pnum); - memcpy(&(sockaddr.sin_addr.s_addr), hp->h_addr, sizeof(struct in_addr)); - - if (connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) { - fprintf(stderr, "%s: net_open(): Connect failed: %s\n", + if (rp == NULL) { + fprintf(stderr, "%s: net_open(): Cannot connect: %s\n", progname, strerror(errno)); - return -1; } - - fdp->ifd = fd; - return 0; + else { + fdp->ifd = fd; + ret = 0; + } + freeaddrinfo(result); + +error: + free(hp); + return ret; } Index: avrdude.1 =================================================================== --- avrdude.1.orig 2014-01-17 17:54:33.433671000 +0100 +++ avrdude.1 2014-02-10 18:58:24.994242025 +0100 @@ -502,6 +502,10 @@ on .Ar host is established. +Square brackets may be placed around +.Ar host +to improve readability, for numeric IPv6 addresses (e.g. +.Li net:[2606:2800::42]:1337 ) . The remote endpoint is assumed to be a terminal or console server that connects the network stream to a local serial port where the actual programmer has been attached to. Index: doc/avrdude.texi =================================================================== --- doc/avrdude.texi.orig 2014-01-17 17:54:33.433671000 +0100 +++ doc/avrdude.texi 2014-02-10 19:13:59.136187968 +0100 @@ -549,6 +549,9 @@ In this case, instead of trying to open a local device, a TCP network connection to (TCP) @var{port} on @var{host} is established. +Square brackets may be placed around @var{host} to improve +readability for numeric IPv6 addresses (e.g. +@code{net:[2606:2800::42]:1337}). The remote endpoint is assumed to be a terminal or console server that connects the network stream to a local serial port where the actual programmer has been attached to. ++++++ avrdude-usbdevices ++++++ 03eb 2104 AVRISP mkII 03eb 2107 AVR-Dragon 03eb 2103 JTAG ICE mkII 03eb 2106 STK600 16c0 05dc USBASP (www.fischl.de) 03eb c7b4 USBASP old VID/PID 03eb 2ffa AT90USB 10c4 ea60 AVR910 1781 0c9f USBtiny 067b 2303 PL2303 USB to serial adapter 2341 0036 Arduino Leonardo boot loader 2341 8036 Arduino Leonardo application 03eb 2044 LUFA CDC Demo Application -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
