diff options
author | arved <arved@FreeBSD.org> | 2007-02-22 00:13:01 +0800 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2007-02-22 00:13:01 +0800 |
commit | cb3dc21a06d8958da8848ba24496067027f70fa6 (patch) | |
tree | 05d532ec3167b42f835f1a6fe615d07efad73092 /devel | |
parent | e8d69ea6240ddb5259036fe635d1fb8bbfc06a99 (diff) | |
download | freebsd-ports-gnome-cb3dc21a06d8958da8848ba24496067027f70fa6.tar.gz freebsd-ports-gnome-cb3dc21a06d8958da8848ba24496067027f70fa6.tar.zst freebsd-ports-gnome-cb3dc21a06d8958da8848ba24496067027f70fa6.zip |
Update to 1.4.0
Diffstat (limited to 'devel')
-rw-r--r-- | devel/pcsc-lite/Makefile | 5 | ||||
-rw-r--r-- | devel/pcsc-lite/distinfo | 6 | ||||
-rw-r--r-- | devel/pcsc-lite/files/patch-pcscdaemon.c | 17 | ||||
-rw-r--r-- | devel/pcsc-lite/files/patch-winscard_msg_srv.c | 33 |
4 files changed, 5 insertions, 56 deletions
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index e966b4304ecd..3c69d256ca36 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -6,10 +6,10 @@ # PORTNAME= pcsc-lite -PORTVERSION= 1.3.3 +PORTVERSION= 1.4.0 PORTEPOCH= 2 CATEGORIES= devel security -MASTER_SITES= http://alioth.debian.org/frs/download.php/1869/ +MASTER_SITES= http://alioth.debian.org/frs/download.php/1819/ DISTNAME= pcsc-lite-${PORTVERSION:S/.b./-beta/} MAINTAINER= arved@FreeBSD.org @@ -35,7 +35,6 @@ CONFIGURE_ARGS+=--enable-debug \ USE_GETOPT_LONG=yes PKGMESSAGE= ${WRKDIR}/pkg-message -MAN1= formaticc.1 MAN5= reader.conf.5 MAN8= pcscd.8 update-reader.conf.8 diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo index de3d1c5a7459..1d44288bf5e9 100644 --- a/devel/pcsc-lite/distinfo +++ b/devel/pcsc-lite/distinfo @@ -1,3 +1,3 @@ -MD5 (pcsc-lite-1.3.3.tar.gz) = 851b090aa0efedd0196f6afd9c0c61bb -SHA256 (pcsc-lite-1.3.3.tar.gz) = 8f3a565b13760e9e05ffff1944755f8651e105069fda96d56e8ae64ae17365f7 -SIZE (pcsc-lite-1.3.3.tar.gz) = 859571 +MD5 (pcsc-lite-1.4.0.tar.gz) = 9ac845b62a683ce9f7c1331741f422ee +SHA256 (pcsc-lite-1.4.0.tar.gz) = 671317c4543452f4618a4e6d97f9d09c89fb518a2010a0a04e3e8c67791477ab +SIZE (pcsc-lite-1.4.0.tar.gz) = 862058 diff --git a/devel/pcsc-lite/files/patch-pcscdaemon.c b/devel/pcsc-lite/files/patch-pcscdaemon.c deleted file mode 100644 index 83a76a03b7fa..000000000000 --- a/devel/pcsc-lite/files/patch-pcscdaemon.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/pcscdaemon.c.orig Mon Jan 22 16:31:21 2007 -+++ src/pcscdaemon.c Mon Jan 22 16:33:52 2007 -@@ -199,6 +199,14 @@ - switch (rsp = SHMProcessEventsServer(&dwClientID, 0)) - { - -+ case 2: -+ /* /* -+ * timeout in SHMProcessEventsServer(): do nothing -+ * this is used to catch the Ctrl-C signal at some time when -+ * nothing else happens -+ */ -+ break; -+ - case 0: - Log2(PCSC_LOG_DEBUG, "A new context thread creation is requested: %d", dwClientID); - rv = CreateContextThread(&dwClientID); diff --git a/devel/pcsc-lite/files/patch-winscard_msg_srv.c b/devel/pcsc-lite/files/patch-winscard_msg_srv.c deleted file mode 100644 index 0a5c681cb6ca..000000000000 --- a/devel/pcsc-lite/files/patch-winscard_msg_srv.c +++ /dev/null @@ -1,33 +0,0 @@ ---- src/winscard_msg_srv.c.orig Mon Jan 22 16:26:53 2007 -+++ src/winscard_msg_srv.c Mon Jan 22 16:29:52 2007 -@@ -169,6 +169,10 @@ - { - fd_set read_fd; - int selret; -+ struct timeval tv; -+ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - FD_ZERO(&read_fd); - -@@ -178,7 +182,7 @@ - FD_SET(commonSocket, &read_fd); - - selret = select(commonSocket + 1, &read_fd, (fd_set *) NULL, -- (fd_set *) NULL, NULL); -+ (fd_set *) NULL, &tv); - - if (selret < 0) - { -@@ -189,6 +193,10 @@ - strerror(errno)); - return -1; - } -+ -+ if (selret == 0) -+ /* timeout */ -+ return 2; - - /* - * A common pipe packet has arrived - it could be a new application |