From owner-svn-src-stable-7@FreeBSD.ORG Tue Mar 11 20:36:24 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA87AE54; Tue, 11 Mar 2014 20:36:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5082CF7; Tue, 11 Mar 2014 20:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BKaN69075762; Tue, 11 Mar 2014 20:36:23 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BKaM8u075753; Tue, 11 Mar 2014 20:36:22 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201403112036.s2BKaM8u075753@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 11 Mar 2014 20:36:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r263044 - stable/7/share/zoneinfo X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 20:36:24 -0000 Author: edwin Date: Tue Mar 11 20:36:22 2014 New Revision: 263044 URL: http://svnweb.freebsd.org/changeset/base/263044 Log: MFC of 263041, tzdata2014a: - Fix historical info about asia/Zion, Ukraine - Fiji starts DST at 02:00 instead of 03:00 - Turkey will move to DST at 31 March this year. Modified: stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/australasia stable/7/share/zoneinfo/europe stable/7/share/zoneinfo/northamerica stable/7/share/zoneinfo/southamerica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/asia ============================================================================== --- stable/7/share/zoneinfo/asia Tue Mar 11 20:35:24 2014 (r263043) +++ stable/7/share/zoneinfo/asia Tue Mar 11 20:36:22 2014 (r263044) @@ -1090,8 +1090,13 @@ Rule Zion 1986 only - May 18 0:00 1:00 D Rule Zion 1986 only - Sep 7 0:00 0 S Rule Zion 1987 only - Apr 15 0:00 1:00 D Rule Zion 1987 only - Sep 13 0:00 0 S -Rule Zion 1988 only - Apr 9 0:00 1:00 D -Rule Zion 1988 only - Sep 3 0:00 0 S + +# From Avigdor Finkelstein (2014-03-05): +# I check the Parliament (Knesset) records and there it's stated that the +# [1988] transition should take place on Saturday night, when the Sabbath +# ends and changes to Sunday. +Rule Zion 1988 only - Apr 10 0:00 1:00 D +Rule Zion 1988 only - Sep 4 0:00 0 S # From Ephraim Silverberg # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22, Modified: stable/7/share/zoneinfo/australasia ============================================================================== --- stable/7/share/zoneinfo/australasia Tue Mar 11 20:35:24 2014 (r263043) +++ stable/7/share/zoneinfo/australasia Tue Mar 11 20:36:22 2014 (r263044) @@ -354,16 +354,18 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 # From the Fijian Government Media Center (2013-08-30) via David Wheeler: -# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am -# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am +# Fiji will start daylight savings on Sunday 27th October, 2013 ... +# move clocks forward by one hour from 2am # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx -# -# From Paul Eggert (2013-09-09): + +# From Steffen Thorsen (2013-01-10): +# Fiji will end DST on 2014-01-19 02:00: +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx + +# From Paul Eggert (2014-01-10): # For now, guess that Fiji springs forward the Sunday before the fourth -# Monday in October. This matches both recent practice and -# timeanddate.com's current spring-forward prediction. -# For the January 2014 transition we guessed right while timeanddate.com -# guessed wrong, so leave the fall-back prediction alone. +# Monday in October, and springs back the penultimate Sunday in January. +# This is ad hoc, but matches recent practice. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S @@ -372,7 +374,8 @@ Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - -Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - +Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 - +Rule Fiji 2014 max - Jan Sun>=18 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time Modified: stable/7/share/zoneinfo/europe ============================================================================== --- stable/7/share/zoneinfo/europe Tue Mar 11 20:35:24 2014 (r263043) +++ stable/7/share/zoneinfo/europe Tue Mar 11 20:36:22 2014 (r263044) @@ -2745,14 +2745,18 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Ju # According to the articles linked below, Turkey will change into summer # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. # This change is due to a nationwide exam on 27th. -# -# # http://www.worldbulletin.net/?aType=haber&ArticleID=70872 -# # Turkish: -# # http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373 -# + +# From Faruk Pasin (2014-02-14): +# The DST for Turkey has been changed for this year because of the +# Turkish Local election.... +# http://www.sabah.com.tr/Ekonomi/2014/02/12/yaz-saatinde-onemli-degisiklik +# ... so Turkey will move clocks forward one hour on March 31 at 3:00 a.m. +# From Paul Eggert (2014-02-17): +# Here is an English-language source: +# http://www.worldbulletin.net/turkey/129016/turkey-switches-to-daylight-saving-time-march-31 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Turkey 1916 only - May 1 0:00 1:00 S @@ -2821,6 +2825,8 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 2:00 Turkey EE%sT 2007 2:00 EU EE%sT 2011 Mar 27 1:00u 2:00 - EET 2011 Mar 28 1:00u + 2:00 EU EE%sT 2014 Mar 30 1:00u + 2:00 - EET 2014 Mar 31 1:00u 2:00 EU EE%sT Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. @@ -2842,19 +2848,13 @@ Link Europe/Istanbul Asia/Istanbul # Ist # approval from 266 deputies. # # Ukraine abolishes transter back to the winter time (in Russian) -# # http://news.mail.ru/politics/6861560/ -# # # The Ukrainians will no longer change the clock (in Russian) -# # http://www.segodnya.ua/news/14290482.html -# # # Deputies cancelled the winter time (in Russian) -# # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ -# # # From Philip Pizzey (2011-10-18): # Today my Ukrainian colleagues have informed me that the @@ -2865,18 +2865,39 @@ Link Europe/Istanbul Asia/Istanbul # Ist # As far as I understand, the recent change to the Ukrainian time zone # (Europe/Kiev) to introduce permanent daylight saving time (similar # to Russia) was reverted today: -# -# # http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995 -# # # Also reported by Alexander Bokovoy (2011-10-18) who also noted: # The law documents themselves are at -# -# # http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 -# +# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28): +# First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST: +# 03 25 1990 02:00 -03.00 1 Time Zone 3 with DST +# 07 01 1990 02:00 -02.00 1 Time Zone 2 with DST +# * Ukrainian Government's Resolution of 18.06.1990, No. 134. +# http://search.ligazakon.ua/l_doc2.nsf/link1/T001500.html +# +# They did not end DST in September, 1990 (according to the law, +# "summer time" was still in action): +# 09 30 1990 03:00 -02.00 1 Time Zone 2 with DST +# * Ukrainian Government's Resolution of 21.09.1990, No. 272. +# http://search.ligazakon.ua/l_doc2.nsf/link1/KP900272.html +# +# Again no change in March, 1991 ("summer time" in action): +# 03 31 1991 02:00 -02.00 1 Time Zone 2 with DST +# +# DST ended in September 1991 ("summer time" ended): +# 09 29 1991 03:00 -02.00 0 Time Zone 2, no DST +# * Ukrainian Government's Resolution of 25.09.1991, No. 225. +# http://www.uazakon.com/documents/date_21/pg_iwgdoc.htm +# This is an answer. +# +# Since 1992 they had normal DST procedure: +# 03 29 1992 02:00 -02.00 1 DST started +# 09 27 1992 03:00 -02.00 0 DST ended +# * Ukrainian Government's Resolution of 20.03.1992, No. 139. +# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Most of Ukraine since 1970 has been like Kiev. @@ -2887,9 +2908,8 @@ Zone Europe/Kiev 2:02:04 - LMT 1880 2:00 - EET 1930 Jun 21 3:00 - MSK 1941 Sep 20 1:00 C-Eur CE%sT 1943 Nov 6 - 3:00 Russia MSK/MSD 1990 - 3:00 - MSK 1990 Jul 1 2:00 - 2:00 - EET 1992 + 3:00 Russia MSK/MSD 1990 Jul 1 2:00 + 2:00 1:00 EEST 1991 Sep 29 3:00 2:00 E-Eur EE%sT 1995 2:00 EU EE%sT # Ruthenia used CET 1990/1991. Modified: stable/7/share/zoneinfo/northamerica ============================================================================== --- stable/7/share/zoneinfo/northamerica Tue Mar 11 20:35:24 2014 (r263043) +++ stable/7/share/zoneinfo/northamerica Tue Mar 11 20:36:22 2014 (r263044) @@ -391,9 +391,10 @@ Zone America/Denver -6:59:56 - LMT 1883 # US Pacific time, represented by Los Angeles # # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater, -# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, -# and the northern three-quarters of Idaho county), -# most of Nevada, most of Oregon, and Washington +# Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county +# north of the Salmon River, and the towns of Burgdorf and Warren), +# Nevada (except West Wendover), Oregon (except the northern 3/4 of +# Malheur county), and Washington # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER Rule CA 1948 only - Mar 14 2:00 1:00 D Modified: stable/7/share/zoneinfo/southamerica ============================================================================== --- stable/7/share/zoneinfo/southamerica Tue Mar 11 20:35:24 2014 (r263043) +++ stable/7/share/zoneinfo/southamerica Tue Mar 11 20:36:22 2014 (r263044) @@ -1275,6 +1275,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1 # start date is 2013-09-08 00:00.... # http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm +# From Jose Miguel Garrido (2014-02-19): +# Today appeared in the Diario Oficial a decree amending the time change +# dates to 2014. +# DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC) +# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC) +# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf + # NOTE: ChileAQ rules for Antarctic bases are stored separately in the # 'antarctica' file. @@ -1608,6 +1615,9 @@ Rule Para 2010 2012 - Apr Sun>=8 0:00 0 # From Carlos Raul Perasso (2013-03-15): # The change in Paraguay is now final. Decree number 10780 # http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf +# From Carlos Raul Perasso (2014-02-28): +# Decree 1264 can be found at: +# http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf Rule Para 2013 max - Mar Sun>=22 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1666,18 +1676,19 @@ Zone America/Paramaribo -3:40:40 - LMT 1 Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 -4:00 - AST +# These all agree with Trinidad and Tobago since 1970. Link America/Port_of_Spain America/Anguilla Link America/Port_of_Spain America/Dominica Link America/Port_of_Spain America/Grenada Link America/Port_of_Spain America/Guadeloupe -Link America/Port_of_Spain America/Marigot +Link America/Port_of_Spain America/Marigot # St Martin (French part) Link America/Port_of_Spain America/Montserrat Link America/Port_of_Spain America/St_Barthelemy -Link America/Port_of_Spain America/St_Kitts +Link America/Port_of_Spain America/St_Kitts # St Kitts & Nevis Link America/Port_of_Spain America/St_Lucia -Link America/Port_of_Spain America/St_Thomas +Link America/Port_of_Spain America/St_Thomas # Virgin Islands (US) Link America/Port_of_Spain America/St_Vincent -Link America/Port_of_Spain America/Tortola +Link America/Port_of_Spain America/Tortola # Virgin Islands (UK) # Uruguay # From Paul Eggert (1993-11-18): From owner-svn-src-stable-7@FreeBSD.ORG Fri Mar 21 23:56:39 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 746CC70C; Fri, 21 Mar 2014 23:56:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53BB0306; Fri, 21 Mar 2014 23:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2LNudk2080709; Fri, 21 Mar 2014 23:56:39 GMT (envelope-from edavis@svn.freebsd.org) Received: (from edavis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2LNud2b080707; Fri, 21 Mar 2014 23:56:39 GMT (envelope-from edavis@svn.freebsd.org) Message-Id: <201403212356.s2LNud2b080707@svn.freebsd.org> From: Eric Davis Date: Fri, 21 Mar 2014 23:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r263584 - stable/7/sys/dev/bxe X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Mar 2014 23:56:39 -0000 Author: edavis Date: Fri Mar 21 23:56:38 2014 New Revision: 263584 URL: http://svnweb.freebsd.org/changeset/base/263584 Log: MFC 262999 Fixed MSI interrupt allocation and handling. Fixed a DMA mapping leak that occurs when defragmenting packet chains. Approved by: davidch (mentor) Modified: stable/7/sys/dev/bxe/bxe.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/bxe/bxe.c ============================================================================== --- stable/7/sys/dev/bxe/bxe.c Fri Mar 21 23:41:21 2014 (r263583) +++ stable/7/sys/dev/bxe/bxe.c Fri Mar 21 23:56:38 2014 (r263584) @@ -34,7 +34,7 @@ #include __FBSDID("$FreeBSD$"); -#define BXE_DRIVER_VERSION "1.78.77" +#define BXE_DRIVER_VERSION "1.78.78" #include "bxe.h" #include "ecore_sp.h" @@ -911,7 +911,7 @@ bxe_dma_map_addr(void *arg, bus_dma_segm dma->paddr = segs->ds_addr; dma->nseg = nseg; #if 0 - BLOGD(dma->sc, DBG_LOAD,, + BLOGD(dma->sc, DBG_LOAD, "DMA alloc '%s': vaddr=%p paddr=%p nseg=%d size=%lu\n", dma->msg, dma->vaddr, (void *)dma->paddr, dma->nseg, dma->size); @@ -5496,7 +5496,7 @@ bxe_tx_encap(struct bxe_fastpath *fp, st } /* make sure it fits in the packet window */ - if (__predict_false(nsegs > 12)) { + if (__predict_false(nsegs > BXE_MAX_SEGMENTS)) { /* * The mbuf may be to big for the controller to handle. If the frame * is a TSO frame we'll need to do an additional check. @@ -5511,8 +5511,9 @@ bxe_tx_encap(struct bxe_fastpath *fp, st fp->eth_q_stats.tx_window_violation_std++; } - /* lets try to defragment this mbuf */ + /* lets try to defragment this mbuf and remap it */ fp->eth_q_stats.mbuf_defrag_attempts++; + bus_dmamap_unload(fp->tx_mbuf_tag, tx_buf->m_map); m0 = m_defrag(*m_head, M_DONTWAIT); if (m0 == NULL) { @@ -5530,10 +5531,12 @@ bxe_tx_encap(struct bxe_fastpath *fp, st /* No sense in trying to defrag/copy chain, drop it. :( */ rc = error; } - - /* if the chain is still too long then drop it */ - if (__predict_false(nsegs > 12)) { - rc = ENODEV; + else { + /* if the chain is still too long then drop it */ + if (__predict_false(nsegs > BXE_MAX_SEGMENTS)) { + bus_dmamap_unload(fp->tx_mbuf_tag, tx_buf->m_map); + rc = ENODEV; + } } } } @@ -9407,13 +9410,13 @@ bxe_interrupt_alloc(struct bxe_softc *sc } if (((sc->devinfo.pcie_cap_flags & BXE_MSI_CAPABLE_FLAG) == 0) || - (msi_count < 2)) { + (msi_count < 1)) { sc->interrupt_mode = INTR_MODE_INTX; /* try INTx next */ break; } - /* ask for the necessary number of MSI vectors */ - num_requested = min((sc->num_queues + 1), msi_count); + /* ask for a single MSI vector */ + num_requested = 1; BLOGD(sc, DBG_LOAD, "Requesting %d MSI vectors\n", num_requested); @@ -9424,8 +9427,8 @@ bxe_interrupt_alloc(struct bxe_softc *sc break; } - if (num_allocated < 2) { /* possible? */ - BLOGE(sc, "MSI allocation less than 2!\n"); + if (num_allocated != 1) { /* possible? */ + BLOGE(sc, "MSI allocation is not 1!\n"); sc->interrupt_mode = INTR_MODE_INTX; /* try INTx next */ pci_release_msi(sc->dev); break; @@ -9436,38 +9439,26 @@ bxe_interrupt_alloc(struct bxe_softc *sc /* best effort so use the number of vectors allocated to us */ sc->intr_count = num_allocated; - sc->num_queues = num_allocated - 1; + sc->num_queues = num_allocated; rid = 1; /* initial resource identifier */ - /* allocate the MSI vectors */ - for (i = 0; i < num_allocated; i++) { - sc->intr[i].rid = (rid + i); - - if ((sc->intr[i].resource = - bus_alloc_resource_any(sc->dev, - SYS_RES_IRQ, - &sc->intr[i].rid, - RF_ACTIVE)) == NULL) { - BLOGE(sc, "Failed to map MSI[%d] (rid=%d)!\n", - i, (rid + i)); - - for (j = (i - 1); j >= 0; j--) { - bus_release_resource(sc->dev, - SYS_RES_IRQ, - sc->intr[j].rid, - sc->intr[j].resource); - } - - sc->intr_count = 0; - sc->num_queues = 0; - sc->interrupt_mode = INTR_MODE_INTX; /* try INTx next */ - pci_release_msi(sc->dev); - break; - } + sc->intr[0].rid = rid; - BLOGD(sc, DBG_LOAD, "Mapped MSI[%d] (rid=%d)\n", i, (rid + i)); + if ((sc->intr[0].resource = + bus_alloc_resource_any(sc->dev, + SYS_RES_IRQ, + &sc->intr[0].rid, + RF_ACTIVE)) == NULL) { + BLOGE(sc, "Failed to map MSI[0] (rid=%d)!\n", rid); + sc->intr_count = 0; + sc->num_queues = 0; + sc->interrupt_mode = INTR_MODE_INTX; /* try INTx next */ + pci_release_msi(sc->dev); + break; } + + BLOGD(sc, DBG_LOAD, "Mapped MSI[0] (rid=%d)\n", rid); } while (0); do { /* try allocating INTx vector resources */ @@ -9646,54 +9637,21 @@ bxe_interrupt_attach(struct bxe_softc *s fp->state = BXE_FP_STATE_IRQ; } } else if (sc->interrupt_mode == INTR_MODE_MSI) { - BLOGD(sc, DBG_LOAD, "Enabling slowpath MSI[0] vector.\n"); + BLOGD(sc, DBG_LOAD, "Enabling MSI[0] vector\n"); /* - * Setup the interrupt handler. Note that we pass the driver instance - * to the interrupt handler for the slowpath. + * Setup the interrupt handler. Note that we pass the + * driver instance to the interrupt handler which + * will handle both the slowpath and fastpath. */ if ((rc = bus_setup_intr(sc->dev, sc->intr[0].resource, (INTR_TYPE_NET | INTR_MPSAFE), - NULL, bxe_intr_sp, sc, + NULL, bxe_intr_legacy, sc, &sc->intr[0].tag)) != 0) { BLOGE(sc, "Failed to allocate MSI[0] vector (%d)\n", rc); goto bxe_interrupt_attach_exit; } - bus_describe_intr(sc->dev, sc->intr[0].resource, - sc->intr[0].tag, "sp"); - - /* bus_bind_intr(sc->dev, sc->intr[0].resource, 0); */ - - /* initialize the fastpath vectors (note the first was used for sp) */ - for (i = 0; i < sc->num_queues; i++) { - fp = &sc->fp[i]; - BLOGD(sc, DBG_LOAD, "Enabling MSI[%d] vector\n", (i + 1)); - - /* - * Setup the interrupt handler. Note that we pass the - * fastpath context to the interrupt handler in this - * case. - */ - if ((rc = bus_setup_intr(sc->dev, sc->intr[i + 1].resource, - (INTR_TYPE_NET | INTR_MPSAFE), - NULL, bxe_intr_fp, fp, - &sc->intr[i + 1].tag)) != 0) { - BLOGE(sc, "Failed to allocate MSI[%d] vector (%d)\n", - (i + 1), rc); - goto bxe_interrupt_attach_exit; - } - - bus_describe_intr(sc->dev, sc->intr[i + 1].resource, - sc->intr[i + 1].tag, "fp%02d", i); - - /* bind the fastpath instance to a cpu */ - if (sc->num_queues > 1) { - bus_bind_intr(sc->dev, sc->intr[i + 1].resource, i); - } - - fp->state = BXE_FP_STATE_IRQ; - } } else { /* (sc->interrupt_mode == INTR_MODE_INTX) */ BLOGD(sc, DBG_LOAD, "Enabling INTx interrupts\n"); From owner-svn-src-stable-7@FreeBSD.ORG Sun Mar 23 14:18:41 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1FBA738; Sun, 23 Mar 2014 14:18:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BE82BDB8; Sun, 23 Mar 2014 14:18:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2NEIfcn027950; Sun, 23 Mar 2014 14:18:41 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2NEIfiq027949; Sun, 23 Mar 2014 14:18:41 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201403231418.s2NEIfiq027949@svn.freebsd.org> From: Dimitry Andric Date: Sun, 23 Mar 2014 14:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r263665 - in stable: 10 7 8 9 X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Mar 2014 14:18:41 -0000 Author: dim Date: Sun Mar 23 14:18:40 2014 New Revision: 263665 URL: http://svnweb.freebsd.org/changeset/base/263665 Log: Turn off warnings for building aicasm. Various versions of yacc exist, which can result in different warnings-as-errors in this tool, but these are all completely harmless. This is a direct commit to stable/7, stable/8, stable/9 and stable/10, since this kernel build tool has already been removed in head. Modified: stable/7/Makefile.inc1 Changes in other areas also in this revision: Modified: stable/10/Makefile.inc1 stable/8/Makefile.inc1 stable/9/Makefile.inc1 Modified: stable/7/Makefile.inc1 ============================================================================== --- stable/7/Makefile.inc1 Sun Mar 23 14:06:09 2014 (r263664) +++ stable/7/Makefile.inc1 Sun Mar 23 14:18:40 2014 (r263665) @@ -737,7 +737,7 @@ buildkernel: cd ${KRNLOBJDIR}/${_kernel}; \ PATH=${BPATH}:${PATH} \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) @@ -745,7 +745,7 @@ buildkernel: cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ PATH=${BPATH}:${PATH} \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) From owner-svn-src-stable-7@FreeBSD.ORG Sat Mar 29 04:19:49 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 96B704B3; Sat, 29 Mar 2014 04:19:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 74CB4A7; Sat, 29 Mar 2014 04:19:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2T4JnbQ060203; Sat, 29 Mar 2014 04:19:49 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2T4Jmt5060198; Sat, 29 Mar 2014 04:19:48 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201403290419.s2T4Jmt5060198@svn.freebsd.org> From: Edwin Groothuis Date: Sat, 29 Mar 2014 04:19:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r263903 - stable/7/share/zoneinfo X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2014 04:19:49 -0000 Author: edwin Date: Sat Mar 29 04:19:48 2014 New Revision: 263903 URL: http://svnweb.freebsd.org/changeset/base/263903 Log: MFC of 263901, tzdata2014b - Update antartica. - Comments about historical data for Hawaii. - Update details for Crimea on 30 March - Move location data Simferopol. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/antarctica stable/7/share/zoneinfo/australasia stable/7/share/zoneinfo/europe stable/7/share/zoneinfo/zone.tab Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa ============================================================================== --- stable/7/share/zoneinfo/africa Sat Mar 29 04:17:46 2014 (r263902) +++ stable/7/share/zoneinfo/africa Sat Mar 29 04:19:48 2014 (r263903) @@ -868,7 +868,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # Another source (specifying the time for start and end in the decree): # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -# From Paul Eggert (2013-10-03): +# From Sebastien Willemijns (2014-03-18): +# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp + +# From Paul Eggert (2014-03-19): # To estimate what the Moroccan government will do in future years, # transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: Modified: stable/7/share/zoneinfo/antarctica ============================================================================== --- stable/7/share/zoneinfo/antarctica Sat Mar 29 04:17:46 2014 (r263902) +++ stable/7/share/zoneinfo/antarctica Sat Mar 29 04:19:48 2014 (r263903) @@ -230,24 +230,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # year-round base # Scott Base, Ross Island, since 1957-01. # See Pacific/Auckland. -# -# These rules for New Zealand are stolen from the 'australasia' file. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D -Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D -Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D -Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D -Rule NZAQ 1975 only - Feb 23 2:00s 0 S -Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S -Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S -Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D -Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S # Norway - territories # Bouvet (never inhabited) # # claims # Peter I Island (never inhabited) +# +# year-round base +# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12 +# +# From Paul-Inge Flakstad (2014-03-10): +# I recently had a long dialog about this with the developer of timegenie.com. +# In the absence of specific dates, he decided to choose some likely ones: +# GMT +1 - From March 1 to the last Sunday in March +# GMT +2 - From the last Sunday in March until the last Sunday in October +# GMT +1 - From the last Sunday in October until November 7 +# GMT +0 - From November 7 until March 1 +# The dates for switching to and from UTC+0 will probably not be absolutely +# correct, but they should be quite close to the actual dates. +# +# From Paul Eggert (2014-03-21): +# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# suggested by Bengt-Inge Larsson comment them out for now, and approximate +# with only UTC and CEST. Uncomment them when 2014b is more prevalent. +# +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET +Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST +#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET +#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC +# Remove the following line when uncommenting the above '#Rule' lines. +Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Troll 0 - zzz 2005 Feb 12 + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 Modified: stable/7/share/zoneinfo/australasia ============================================================================== --- stable/7/share/zoneinfo/australasia Sat Mar 29 04:17:46 2014 (r263902) +++ stable/7/share/zoneinfo/australasia Sat Mar 29 04:19:48 2014 (r263903) @@ -763,14 +763,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind. +# Details are uncertain. We have no data for Johnston after 1970, so +# treat it like Hawaii for now. +# # In his memoirs of June 6th to October 4, 1945 # (2005), Herbert C. Bach writes, # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM # Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and # confirms that Johnston kept the same time as Honolulu in summer 1945. -# We have no better information, so for now, assume this has been true -# indefinitely into the past. +# +# From Lyle McElhaney (2014-03-11): +# [W]hen JI was being used for that [atomic bomb] testing, the time being used +# was not Hawaiian time but rather the same time being used on the ships, +# which had a GMT offset of -11 hours. This apparently applied to at least the +# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last +# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin, +# "The United States High-Altitude Test Experience: A Review Emphasizing the +# Impact on the Environment", Los Alamos LA-6405, Oct 1976 +# . +# See the table on page 4 where he lists GMT and local times for the tests; a +# footnote for the JI tests reads that local time is "JI time = Hawaii Time +# Minus One Hour". # # See 'northamerica' for Pacific/Johnston. Modified: stable/7/share/zoneinfo/europe ============================================================================== --- stable/7/share/zoneinfo/europe Sat Mar 29 04:17:46 2014 (r263902) +++ stable/7/share/zoneinfo/europe Sat Mar 29 04:19:48 2014 (r263903) @@ -2963,7 +2963,11 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT +# From Alexander Krivenyshev (2014-03-17): +# time change at 2:00 (2am) on March 30, 2014 +# http://vz.ru/news/2014/3/17/677464.html + 2:00 EU EE%sT 2014 Mar 30 2:00 + 4:00 - MSK # Vatican City # See Europe/Rome. Modified: stable/7/share/zoneinfo/zone.tab ============================================================================== --- stable/7/share/zoneinfo/zone.tab Sat Mar 29 04:17:46 2014 (r263902) +++ stable/7/share/zoneinfo/zone.tab Sat Mar 29 04:19:48 2014 (r263903) @@ -52,6 +52,7 @@ AQ -6617+11031 Antarctica/Casey Casey St AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) @@ -344,6 +345,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia +RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk @@ -399,7 +401,6 @@ TZ -0648+03917 Africa/Dar_es_Salaam UA +5026+03031 Europe/Kiev most locations UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk -UA +4457+03406 Europe/Simferopol central Crimea UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands From owner-svn-src-stable-7@FreeBSD.ORG Sat May 10 02:06:51 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3CCB6FB; Sat, 10 May 2014 02:06:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A467B308; Sat, 10 May 2014 02:06:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A26p02012581; Sat, 10 May 2014 02:06:51 GMT (envelope-from davidcs@svn.freebsd.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A26k9x012548; Sat, 10 May 2014 02:06:46 GMT (envelope-from davidcs@svn.freebsd.org) Message-Id: <201405100206.s4A26k9x012548@svn.freebsd.org> From: David C Somayajulu Date: Sat, 10 May 2014 02:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r265794 - in stable/7/sys: dev/bxe modules/bxe X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 02:06:51 -0000 Author: davidcs Date: Sat May 10 02:06:46 2014 New Revision: 265794 URL: http://svnweb.freebsd.org/changeset/base/265794 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davidcs@freebsd.org) QLogic Corporation Modified: stable/7/sys/dev/bxe/57710_init_values.c stable/7/sys/dev/bxe/57710_int_offsets.h stable/7/sys/dev/bxe/57711_init_values.c stable/7/sys/dev/bxe/57711_int_offsets.h stable/7/sys/dev/bxe/57712_init_values.c stable/7/sys/dev/bxe/57712_int_offsets.h stable/7/sys/dev/bxe/bxe.c stable/7/sys/dev/bxe/bxe.h stable/7/sys/dev/bxe/bxe_dcb.h stable/7/sys/dev/bxe/bxe_debug.c stable/7/sys/dev/bxe/bxe_elink.c stable/7/sys/dev/bxe/bxe_elink.h stable/7/sys/dev/bxe/bxe_stats.c stable/7/sys/dev/bxe/bxe_stats.h stable/7/sys/dev/bxe/ecore_fw_defs.h stable/7/sys/dev/bxe/ecore_hsi.h stable/7/sys/dev/bxe/ecore_init.h stable/7/sys/dev/bxe/ecore_init_ops.h stable/7/sys/dev/bxe/ecore_mfw_req.h stable/7/sys/dev/bxe/ecore_reg.h stable/7/sys/dev/bxe/ecore_sp.c stable/7/sys/dev/bxe/ecore_sp.h stable/7/sys/modules/bxe/Makefile Directory Properties: stable/7/ (props changed) stable/7/sys/ (props changed) Modified: stable/7/sys/dev/bxe/57710_init_values.c ============================================================================== --- stable/7/sys/dev/bxe/57710_init_values.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57710_init_values.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57710_int_offsets.h ============================================================================== --- stable/7/sys/dev/bxe/57710_int_offsets.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57710_int_offsets.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57711_init_values.c ============================================================================== --- stable/7/sys/dev/bxe/57711_init_values.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57711_init_values.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57711_int_offsets.h ============================================================================== --- stable/7/sys/dev/bxe/57711_int_offsets.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57711_int_offsets.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57712_init_values.c ============================================================================== --- stable/7/sys/dev/bxe/57712_init_values.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57712_init_values.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/57712_int_offsets.h ============================================================================== --- stable/7/sys/dev/bxe/57712_int_offsets.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/57712_int_offsets.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe.c ============================================================================== --- stable/7/sys/dev/bxe/bxe.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe.h ============================================================================== --- stable/7/sys/dev/bxe/bxe.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_dcb.h ============================================================================== --- stable/7/sys/dev/bxe/bxe_dcb.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_dcb.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_debug.c ============================================================================== --- stable/7/sys/dev/bxe/bxe_debug.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_debug.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_elink.c ============================================================================== --- stable/7/sys/dev/bxe/bxe_elink.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_elink.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_elink.h ============================================================================== --- stable/7/sys/dev/bxe/bxe_elink.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_elink.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_stats.c ============================================================================== --- stable/7/sys/dev/bxe/bxe_stats.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_stats.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe_stats.h ============================================================================== --- stable/7/sys/dev/bxe/bxe_stats.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/bxe_stats.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_fw_defs.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_fw_defs.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_fw_defs.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_hsi.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_hsi.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_hsi.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_init.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_init.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_init.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_init_ops.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_init_ops.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_init_ops.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_mfw_req.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_mfw_req.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_mfw_req.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_reg.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_reg.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_reg.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_sp.c ============================================================================== --- stable/7/sys/dev/bxe/ecore_sp.c Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_sp.c Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/ecore_sp.h ============================================================================== --- stable/7/sys/dev/bxe/ecore_sp.h Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/dev/bxe/ecore_sp.h Sat May 10 02:06:46 2014 (r265794) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Davis - * David Christensen - * Gary Zambrano + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/modules/bxe/Makefile ============================================================================== --- stable/7/sys/modules/bxe/Makefile Sat May 10 01:45:39 2014 (r265793) +++ stable/7/sys/modules/bxe/Makefile Sat May 10 02:06:46 2014 (r265794) @@ -15,4 +15,9 @@ SRCS += bxe.c \ CFLAGS += -I${BXE} +clean: + rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms + rm -f *.o *.kld *.ko + rm -f @ machine x86 + .include From owner-svn-src-stable-7@FreeBSD.ORG Mon May 12 16:10:16 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29754D06; Mon, 12 May 2014 16:10:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13EFC2554; Mon, 12 May 2014 16:10:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CGAGl2019216; Mon, 12 May 2014 16:10:16 GMT (envelope-from davidcs@svn.freebsd.org) Received: (from davidcs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CGAExO019198; Mon, 12 May 2014 16:10:14 GMT (envelope-from davidcs@svn.freebsd.org) Message-Id: <201405121610.s4CGAExO019198@svn.freebsd.org> From: David C Somayajulu Date: Mon, 12 May 2014 16:10:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r265920 - in stable/7: share/man/man4 sys/dev/bce sys/dev/bxe sys/modules/bce X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 16:10:16 -0000 Author: davidcs Date: Mon May 12 16:10:14 2014 New Revision: 265920 URL: http://svnweb.freebsd.org/changeset/base/265920 Log: MFC r265703 Modify Copyright information and other strings to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business. Added clean option to Makefile Submitted by: David C Somayajulu (davidcs@freebsd.org) QLogic Corporation Modified: stable/7/share/man/man4/bce.4 stable/7/share/man/man4/bxe.4 stable/7/sys/dev/bce/if_bce.c stable/7/sys/dev/bce/if_bcefw.h stable/7/sys/dev/bce/if_bcereg.h stable/7/sys/dev/bxe/bxe.c stable/7/sys/modules/bce/Makefile Directory Properties: stable/7/ (props changed) stable/7/share/ (props changed) stable/7/share/man/ (props changed) stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) Modified: stable/7/share/man/man4/bce.4 ============================================================================== --- stable/7/share/man/man4/bce.4 Mon May 12 15:59:09 2014 (r265919) +++ stable/7/share/man/man4/bce.4 Mon May 12 16:10:14 2014 (r265920) @@ -1,5 +1,4 @@ -.\" Copyright (c) 2006 Broadcom Corporation -.\" David Christensen . All rights reserved. +.\" Copyright (c) 2006-2014 QLogic Corporation .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -10,9 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Broadcom Corporation nor the name of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written consent. .\" .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -33,7 +29,7 @@ .Os .Sh NAME .Nm bce -.Nd "Broadcom NetXtreme II (BCM5706/5708/5709/5716) PCI/PCIe Gigabit Ethernet adapter driver" +.Nd "QLogic NetXtreme II (BCM5706/5708/5709/5716) PCI/PCIe Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -52,7 +48,7 @@ if_bce_load="YES" .Sh DESCRIPTION The .Nm -driver supports Broadcom's NetXtreme II product family, including the +driver supports QLogic's NetXtreme II product family, including the BCM5706, BCM5708, BCM5709 and BCM5716 Ethernet controllers. .Pp The NetXtreme II product family is composed of various Converged NIC (or CNIC) @@ -141,25 +137,25 @@ For more information on configuring this .Sh HARDWARE The .Nm -driver provides support for various NICs based on the Broadcom NetXtreme II +driver provides support for various NICs based on the QLogic NetXtreme II family of Gigabit Ethernet controllers, including the following: .Pp .Bl -bullet -compact .It -Broadcom NetXtreme II BCM5706 1000Base-SX +QLogic NetXtreme II BCM5706 1000Base-SX .It -Broadcom NetXtreme II BCM5706 1000Base-T +QLogic NetXtreme II BCM5706 1000Base-T .It -Broadcom NetXtreme II BCM5708 1000Base-SX +QLogic NetXtreme II BCM5708 1000Base-SX .It -Broadcom NetXtreme II BCM5708 1000Base-T +QLogic NetXtreme II BCM5708 1000Base-T .It -Broadcom NetXtreme II BCM5709 1000Base-SX +QLogic NetXtreme II BCM5709 1000Base-SX .It -Broadcom NetXtreme II BCM5709 1000Base-T +QLogic NetXtreme II BCM5709 1000Base-T .It -Broadcom NetXtreme II BCM5716 1000Base-T +QLogic NetXtreme II BCM5716 1000Base-T .It Dell PowerEdge 1950 integrated BCM5708 NIC .It @@ -346,6 +342,12 @@ with the cable connection, or a driver l A controller hardware failure has occurred. If the problem continues replace the controller. .El +.Sh SUPPORT +For support questions please contact your QLogic approved reseller or +QLogic Technical Support at +.Pa http://support.qlogic.com , +or by E-mail at +.Aq support@qlogic.com . .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , Modified: stable/7/share/man/man4/bxe.4 ============================================================================== --- stable/7/share/man/man4/bxe.4 Mon May 12 15:59:09 2014 (r265919) +++ stable/7/share/man/man4/bxe.4 Mon May 12 16:10:14 2014 (r265920) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2013 Broadcom Corporation. All rights reserved. +.\" Copyright (c) 2014 Qlogic Corporation. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -9,9 +9,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Broadcom Corporation nor the name of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written consent. .\" .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -32,7 +29,7 @@ .Os .Sh NAME .Nm bxe -.Nd Broadcom NetXtreme II Ethernet 10Gb PCIe adapter driver +.Nd QLogic NetXtreme II Ethernet 10Gb PCIe adapter driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -50,7 +47,7 @@ if_bxe_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for PCIe 10Gb Ethernet adapters based on the Broadcom +driver provides support for PCIe 10Gb Ethernet adapters based on the QLogic NetXtreme II family of 10Gb chips. The driver supports Jumbo Frames, VLAN tagging, checksum offload (IPv4, TCP, UDP, IPv6-TCP, IPv6-UDP), MSI-X @@ -59,32 +56,32 @@ Receive Side Scaling (RSS). .Sh HARDWARE The .Nm -driver provides support for various NICs based on the Broadcom NetXtreme II +driver provides support for various NICs based on the QLogic NetXtreme II family of 10Gb Ethernet controller chips, including the following: .Pp .Bl -bullet -compact .It -Broadcom NetXtreme II BCM57710 10Gb +QLogic NetXtreme II BCM57710 10Gb .It -Broadcom NetXtreme II BCM57711 10Gb +QLogic NetXtreme II BCM57711 10Gb .It -Broadcom NetXtreme II BCM57711E 10Gb +QLogic NetXtreme II BCM57711E 10Gb .It -Broadcom NetXtreme II BCM57712 10Gb +QLogic NetXtreme II BCM57712 10Gb .It -Broadcom NetXtreme II BCM57712-MF 10Gb +QLogic NetXtreme II BCM57712-MF 10Gb .It -Broadcom NetXtreme II BCM57800 10Gb +QLogic NetXtreme II BCM57800 10Gb .It -Broadcom NetXtreme II BCM57800-MF 10Gb +QLogic NetXtreme II BCM57800-MF 10Gb .It -Broadcom NetXtreme II BCM57810 10Gb +QLogic NetXtreme II BCM57810 10Gb .It -Broadcom NetXtreme II BCM57810-MF 10Gb +QLogic NetXtreme II BCM57810-MF 10Gb .It -Broadcom NetXtreme II BCM57840 10Gb / 20Gb +QLogic NetXtreme II BCM57840 10Gb / 20Gb .It -Broadcom NetXtreme II BCM57840-MF 10Gb +QLogic NetXtreme II BCM57840-MF 10Gb .El .Sh CONFIGURATION There a number of configuration parameters that can be set to tweak the @@ -318,6 +315,12 @@ When finished turn the logging back off: .Bd -literal -offset indent # sysctl dev.bxe.0.debug=0 .Ed +.Sh SUPPORT +For support questions please contact your QLogic approved reseller or +QLogic Technical Support at +.Pa http://support.qlogic.com , +or by E-mail at +.Aq support@qlogic.com . .Sh SEE ALSO .Xr netstat 1 , .Xr altq 4 , Modified: stable/7/sys/dev/bce/if_bce.c ============================================================================== --- stable/7/sys/dev/bce/if_bce.c Mon May 12 15:59:09 2014 (r265919) +++ stable/7/sys/dev/bce/if_bce.c Mon May 12 16:10:14 2014 (r265920) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006-2010 Broadcom Corporation - * David Christensen . All rights reserved. + * Copyright (c) 2006-2014 QLogic Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -11,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -106,13 +102,13 @@ static struct bce_type bce_devs[] = { { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x1709, "HP NC371i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5706 1000Base-T" }, + "QLogic NetXtreme II BCM5706 1000Base-T" }, /* BCM5706S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5706S, HP_VENDORID, 0x3102, "HP NC370F Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5706 1000Base-SX" }, + "QLogic NetXtreme II BCM5706 1000Base-SX" }, /* BCM5708C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037, @@ -122,7 +118,7 @@ static struct bce_type bce_devs[] = { { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7045, "HP NC374m PCIe Multifunction Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708 1000Base-T" }, + "QLogic NetXtreme II BCM5708 1000Base-T" }, /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x1706, @@ -132,7 +128,7 @@ static struct bce_type bce_devs[] = { { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703d, "HP NC373F PCIe Multifunc Giga Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708 1000Base-SX" }, + "QLogic NetXtreme II BCM5708 1000Base-SX" }, /* BCM5709C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7055, @@ -140,7 +136,7 @@ static struct bce_type bce_devs[] = { { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7059, "HP NC382T PCIe DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5709 1000Base-T" }, + "QLogic NetXtreme II BCM5709 1000Base-T" }, /* BCM5709S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x171d, @@ -148,11 +144,11 @@ static struct bce_type bce_devs[] = { { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x7056, "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + "QLogic NetXtreme II BCM5709 1000Base-SX" }, /* BCM5716 controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5716 1000Base-T" }, + "QLogic NetXtreme II BCM5716 1000Base-T" }, { 0, 0, 0, 0, NULL } }; Modified: stable/7/sys/dev/bce/if_bcefw.h ============================================================================== --- stable/7/sys/dev/bce/if_bcefw.h Mon May 12 15:59:09 2014 (r265919) +++ stable/7/sys/dev/bce/if_bcefw.h Mon May 12 16:10:14 2014 (r265920) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006-2011 Broadcom Corporation - * David Christensen . All rights reserved. + * Copyright (c) 2006-2014 QLogic Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,9 +9,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -31,7 +27,7 @@ /* * This file contains firmware data derived from proprietary unpublished - * source code, Copyright (c) 2004-2011 Broadcom Corporation. + * source code, Copyright (c) 2004-2014 QLogic Corporation. * * Permission is hereby granted for the distribution of this firmware data * in hexadecimal or equivalent format, provided this copyright notice also Modified: stable/7/sys/dev/bce/if_bcereg.h ============================================================================== --- stable/7/sys/dev/bce/if_bcereg.h Mon May 12 15:59:09 2014 (r265919) +++ stable/7/sys/dev/bce/if_bcereg.h Mon May 12 16:10:14 2014 (r265920) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006-2010 Broadcom Corporation - * David Christensen . All rights reserved. + * Copyright (c) 2006-2014 QLogic Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,9 +9,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/7/sys/dev/bxe/bxe.c ============================================================================== --- stable/7/sys/dev/bxe/bxe.c Mon May 12 15:59:09 2014 (r265919) +++ stable/7/sys/dev/bxe/bxe.c Mon May 12 16:10:14 2014 (r265920) @@ -98,126 +98,126 @@ static struct bxe_device_type bxe_devs[] BRCM_VENDORID, CHIP_NUM_57710, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57710 10GbE" + "QLogic NetXtreme II BCM57710 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57711, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57711 10GbE" + "QLogic NetXtreme II BCM57711 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57711E, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57711E 10GbE" + "QLogic NetXtreme II BCM57711E 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57712, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57712 10GbE" + "QLogic NetXtreme II BCM57712 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57712_MF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57712 MF 10GbE" + "QLogic NetXtreme II BCM57712 MF 10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57712_VF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57712 VF 10GbE" + "QLogic NetXtreme II BCM57712 VF 10GbE" }, #endif { BRCM_VENDORID, CHIP_NUM_57800, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57800 10GbE" + "QLogic NetXtreme II BCM57800 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57800_MF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57800 MF 10GbE" + "QLogic NetXtreme II BCM57800 MF 10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57800_VF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57800 VF 10GbE" + "QLogic NetXtreme II BCM57800 VF 10GbE" }, #endif { BRCM_VENDORID, CHIP_NUM_57810, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57810 10GbE" + "QLogic NetXtreme II BCM57810 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57810_MF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57810 MF 10GbE" + "QLogic NetXtreme II BCM57810 MF 10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57810_VF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57810 VF 10GbE" + "QLogic NetXtreme II BCM57810 VF 10GbE" }, #endif { BRCM_VENDORID, CHIP_NUM_57811, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57811 10GbE" + "QLogic NetXtreme II BCM57811 10GbE" }, { BRCM_VENDORID, CHIP_NUM_57811_MF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57811 MF 10GbE" + "QLogic NetXtreme II BCM57811 MF 10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57811_VF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57811 VF 10GbE" + "QLogic NetXtreme II BCM57811 VF 10GbE" }, #endif { BRCM_VENDORID, CHIP_NUM_57840_4_10, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57840 4x10GbE" + "QLogic NetXtreme II BCM57840 4x10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57840_2_20, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57840 2x20GbE" + "QLogic NetXtreme II BCM57840 2x20GbE" }, #endif { BRCM_VENDORID, CHIP_NUM_57840_MF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57840 MF 10GbE" + "QLogic NetXtreme II BCM57840 MF 10GbE" }, #if 0 { BRCM_VENDORID, CHIP_NUM_57840_VF, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM57840 VF 10GbE" + "QLogic NetXtreme II BCM57840 VF 10GbE" }, #endif { Modified: stable/7/sys/modules/bce/Makefile ============================================================================== --- stable/7/sys/modules/bce/Makefile Mon May 12 15:59:09 2014 (r265919) +++ stable/7/sys/modules/bce/Makefile Mon May 12 16:10:14 2014 (r265920) @@ -5,4 +5,9 @@ SRCS= opt_bce.h if_bce.c miibus_if.h mii #CFLAGS += -DBCE_DEBUG=0 +clean: + rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms + rm -f *.o *.kld *.ko + rm -f @ machine x86 miibus_if.h miidevs.h opt_bce.h + .include From owner-svn-src-stable-7@FreeBSD.ORG Tue May 13 21:29:20 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 480ED64C; Tue, 13 May 2014 21:29:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28F6F207E; Tue, 13 May 2014 21:29:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DLTKUg005072; Tue, 13 May 2014 21:29:20 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DLTJJv005066; Tue, 13 May 2014 21:29:19 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201405132129.s4DLTJJv005066@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 13 May 2014 21:29:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r265980 - stable/7/share/zoneinfo X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 21:29:20 -0000 Author: edwin Date: Tue May 13 21:29:19 2014 New Revision: 265980 URL: http://svnweb.freebsd.org/changeset/base/265980 Log: MFC of 265978, tzdata2014c - Egypt will go into DST on 15 May 2014. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/europe Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa ============================================================================== --- stable/7/share/zoneinfo/africa Tue May 13 21:27:18 2014 (r265979) +++ stable/7/share/zoneinfo/africa Tue May 13 21:29:19 2014 (r265980) @@ -335,11 +335,54 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May "midnight" (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008 only - Aug lastThu 23:00s 0 - Rule Egypt 2009 only - Aug 20 23:00s 0 - Rule Egypt 2010 only - Aug 11 0:00 0 - Rule Egypt 2010 only - Sep 10 0:00 1:00 S Rule Egypt 2010 only - Sep lastThu 23:00s 0 - +Rule Egypt 2014 only - May 15 24:00 1:00 S +Rule Egypt 2014 only - Jun 29 0:00s 0 - +Rule Egypt 2014 only - Jul 29 0:00s 1:00 S +Rule Egypt 2014 max - Sep lastThu 23:00s 0 - +Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S +Rule Egypt 2015 only - Jun 18 0:00s 0 - +Rule Egypt 2015 only - Jul 18 0:00s 1:00 S +Rule Egypt 2016 only - Jun 7 0:00s 0 - +Rule Egypt 2016 only - Jul 7 0:00s 1:00 S +Rule Egypt 2017 only - May 27 0:00s 0 - +Rule Egypt 2017 only - Jun 26 0:00s 1:00 S +Rule Egypt 2018 only - May 16 0:00s 0 - +Rule Egypt 2018 only - Jun 15 0:00s 1:00 S +Rule Egypt 2019 only - May 6 0:00s 0 - +Rule Egypt 2019 only - Jun 5 0:00s 1:00 S +Rule Egypt 2020 only - May 24 0:00s 1:00 S +Rule Egypt 2021 only - May 13 0:00s 1:00 S +Rule Egypt 2022 only - May 3 0:00s 1:00 S +Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:09 - LMT 1900 Oct Modified: stable/7/share/zoneinfo/asia ============================================================================== --- stable/7/share/zoneinfo/asia Tue May 13 21:27:18 2014 (r265979) +++ stable/7/share/zoneinfo/asia Tue May 13 21:29:19 2014 (r265980) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # "Jordan will switch to winter time on Friday, October 27". # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in March since 2002. -# Please see -# -# http://www.timeanddate.com/worldclock/timezone.html?n=11 -# - # From Steffen Thorsen (2009-04-02): # This single one might be good enough, (2009-03-24, Arabic): # Modified: stable/7/share/zoneinfo/europe ============================================================================== --- stable/7/share/zoneinfo/europe Tue May 13 21:27:18 2014 (r265979) +++ stable/7/share/zoneinfo/europe Tue May 13 21:29:19 2014 (r265980) @@ -2966,6 +2966,10 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 # From Alexander Krivenyshev (2014-03-17): # time change at 2:00 (2am) on March 30, 2014 # http://vz.ru/news/2014/3/17/677464.html +# From Paul Eggert (2014-03-30): +# Simferopol and Sevastopol reportedly changed their central town clocks +# late the previous day, but this appears to have been ceremonial +# and the discrepancies are small enough to not worry about. 2:00 EU EE%sT 2014 Mar 30 2:00 4:00 - MSK From owner-svn-src-stable-7@FreeBSD.ORG Mon May 26 15:31:45 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46D2CE35; Mon, 26 May 2014 15:31:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E3972EC8; Mon, 26 May 2014 15:31:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QFVjf9095918; Mon, 26 May 2014 15:31:45 GMT (envelope-from gshapiro@svn.freebsd.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QFVR2L095247; Mon, 26 May 2014 15:31:27 GMT (envelope-from gshapiro@svn.freebsd.org) Message-Id: <201405261531.s4QFVR2L095247@svn.freebsd.org> From: Gregory Neil Shapiro Date: Mon, 26 May 2014 15:31:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r266694 - in stable/7/contrib/sendmail: . cf cf/cf cf/domain cf/feature cf/hack cf/m4 cf/mailer cf/ostype cf/sh contrib doc/op editmap include/libmilter include/libsmdb include/sendmail... X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 15:31:45 -0000 Author: gshapiro Date: Mon May 26 15:31:26 2014 New Revision: 266694 URL: http://svnweb.freebsd.org/changeset/base/266694 Log: MFC: Merge sendmail 8.14.9 to HEAD Modified: stable/7/contrib/sendmail/CACerts stable/7/contrib/sendmail/FAQ stable/7/contrib/sendmail/INSTALL stable/7/contrib/sendmail/KNOWNBUGS stable/7/contrib/sendmail/LICENSE stable/7/contrib/sendmail/Makefile stable/7/contrib/sendmail/PGPKEYS stable/7/contrib/sendmail/README stable/7/contrib/sendmail/RELEASE_NOTES stable/7/contrib/sendmail/cf/README stable/7/contrib/sendmail/cf/cf/Makefile stable/7/contrib/sendmail/cf/cf/README stable/7/contrib/sendmail/cf/cf/chez.cs.mc stable/7/contrib/sendmail/cf/cf/clientproto.mc stable/7/contrib/sendmail/cf/cf/cs-hpux10.mc stable/7/contrib/sendmail/cf/cf/cs-hpux9.mc stable/7/contrib/sendmail/cf/cf/cs-osf1.mc stable/7/contrib/sendmail/cf/cf/cs-solaris2.mc stable/7/contrib/sendmail/cf/cf/cs-sunos4.1.mc stable/7/contrib/sendmail/cf/cf/cs-ultrix4.mc stable/7/contrib/sendmail/cf/cf/cyrusproto.mc stable/7/contrib/sendmail/cf/cf/generic-bsd4.4.mc stable/7/contrib/sendmail/cf/cf/generic-hpux10.mc stable/7/contrib/sendmail/cf/cf/generic-hpux9.mc stable/7/contrib/sendmail/cf/cf/generic-linux.mc stable/7/contrib/sendmail/cf/cf/generic-mpeix.mc stable/7/contrib/sendmail/cf/cf/generic-nextstep3.3.mc stable/7/contrib/sendmail/cf/cf/generic-osf1.mc stable/7/contrib/sendmail/cf/cf/generic-solaris.mc stable/7/contrib/sendmail/cf/cf/generic-sunos4.1.mc stable/7/contrib/sendmail/cf/cf/generic-ultrix4.mc stable/7/contrib/sendmail/cf/cf/huginn.cs.mc stable/7/contrib/sendmail/cf/cf/knecht.mc stable/7/contrib/sendmail/cf/cf/mail.cs.mc stable/7/contrib/sendmail/cf/cf/mail.eecs.mc stable/7/contrib/sendmail/cf/cf/mailspool.cs.mc stable/7/contrib/sendmail/cf/cf/python.cs.mc stable/7/contrib/sendmail/cf/cf/s2k-osf1.mc stable/7/contrib/sendmail/cf/cf/s2k-ultrix4.mc stable/7/contrib/sendmail/cf/cf/submit.cf stable/7/contrib/sendmail/cf/cf/submit.mc stable/7/contrib/sendmail/cf/cf/tcpproto.mc stable/7/contrib/sendmail/cf/cf/ucbarpa.mc stable/7/contrib/sendmail/cf/cf/ucbvax.mc stable/7/contrib/sendmail/cf/cf/uucpproto.mc stable/7/contrib/sendmail/cf/cf/vangogh.cs.mc stable/7/contrib/sendmail/cf/domain/Berkeley.EDU.m4 stable/7/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 stable/7/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 stable/7/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 stable/7/contrib/sendmail/cf/domain/berkeley-only.m4 stable/7/contrib/sendmail/cf/domain/generic.m4 stable/7/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 stable/7/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 stable/7/contrib/sendmail/cf/feature/access_db.m4 stable/7/contrib/sendmail/cf/feature/allmasquerade.m4 stable/7/contrib/sendmail/cf/feature/always_add_domain.m4 stable/7/contrib/sendmail/cf/feature/authinfo.m4 stable/7/contrib/sendmail/cf/feature/badmx.m4 stable/7/contrib/sendmail/cf/feature/bestmx_is_local.m4 stable/7/contrib/sendmail/cf/feature/bitdomain.m4 stable/7/contrib/sendmail/cf/feature/blacklist_recipients.m4 stable/7/contrib/sendmail/cf/feature/block_bad_helo.m4 stable/7/contrib/sendmail/cf/feature/compat_check.m4 stable/7/contrib/sendmail/cf/feature/conncontrol.m4 stable/7/contrib/sendmail/cf/feature/delay_checks.m4 stable/7/contrib/sendmail/cf/feature/dnsbl.m4 stable/7/contrib/sendmail/cf/feature/domaintable.m4 stable/7/contrib/sendmail/cf/feature/enhdnsbl.m4 stable/7/contrib/sendmail/cf/feature/generics_entire_domain.m4 stable/7/contrib/sendmail/cf/feature/genericstable.m4 stable/7/contrib/sendmail/cf/feature/greet_pause.m4 stable/7/contrib/sendmail/cf/feature/ldap_routing.m4 stable/7/contrib/sendmail/cf/feature/limited_masquerade.m4 stable/7/contrib/sendmail/cf/feature/local_lmtp.m4 stable/7/contrib/sendmail/cf/feature/local_no_masquerade.m4 stable/7/contrib/sendmail/cf/feature/local_procmail.m4 stable/7/contrib/sendmail/cf/feature/lookupdotdomain.m4 stable/7/contrib/sendmail/cf/feature/loose_relay_check.m4 stable/7/contrib/sendmail/cf/feature/mailertable.m4 stable/7/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 stable/7/contrib/sendmail/cf/feature/masquerade_envelope.m4 stable/7/contrib/sendmail/cf/feature/msp.m4 stable/7/contrib/sendmail/cf/feature/mtamark.m4 stable/7/contrib/sendmail/cf/feature/no_default_msa.m4 stable/7/contrib/sendmail/cf/feature/nocanonify.m4 stable/7/contrib/sendmail/cf/feature/notsticky.m4 stable/7/contrib/sendmail/cf/feature/nouucp.m4 stable/7/contrib/sendmail/cf/feature/nullclient.m4 stable/7/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 stable/7/contrib/sendmail/cf/feature/preserve_luser_host.m4 stable/7/contrib/sendmail/cf/feature/promiscuous_relay.m4 stable/7/contrib/sendmail/cf/feature/queuegroup.m4 stable/7/contrib/sendmail/cf/feature/ratecontrol.m4 stable/7/contrib/sendmail/cf/feature/redirect.m4 stable/7/contrib/sendmail/cf/feature/relay_based_on_MX.m4 stable/7/contrib/sendmail/cf/feature/relay_entire_domain.m4 stable/7/contrib/sendmail/cf/feature/relay_hosts_only.m4 stable/7/contrib/sendmail/cf/feature/relay_local_from.m4 stable/7/contrib/sendmail/cf/feature/relay_mail_from.m4 stable/7/contrib/sendmail/cf/feature/require_rdns.m4 stable/7/contrib/sendmail/cf/feature/smrsh.m4 stable/7/contrib/sendmail/cf/feature/stickyhost.m4 stable/7/contrib/sendmail/cf/feature/use_client_ptr.m4 stable/7/contrib/sendmail/cf/feature/use_ct_file.m4 stable/7/contrib/sendmail/cf/feature/use_cw_file.m4 stable/7/contrib/sendmail/cf/feature/uucpdomain.m4 stable/7/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 stable/7/contrib/sendmail/cf/feature/virtusertable.m4 stable/7/contrib/sendmail/cf/hack/cssubdomain.m4 stable/7/contrib/sendmail/cf/m4/cf.m4 stable/7/contrib/sendmail/cf/m4/cfhead.m4 stable/7/contrib/sendmail/cf/m4/proto.m4 stable/7/contrib/sendmail/cf/m4/version.m4 stable/7/contrib/sendmail/cf/mailer/cyrus.m4 stable/7/contrib/sendmail/cf/mailer/cyrusv2.m4 stable/7/contrib/sendmail/cf/mailer/fax.m4 stable/7/contrib/sendmail/cf/mailer/local.m4 stable/7/contrib/sendmail/cf/mailer/mail11.m4 stable/7/contrib/sendmail/cf/mailer/phquery.m4 stable/7/contrib/sendmail/cf/mailer/pop.m4 stable/7/contrib/sendmail/cf/mailer/procmail.m4 stable/7/contrib/sendmail/cf/mailer/qpage.m4 stable/7/contrib/sendmail/cf/mailer/smtp.m4 stable/7/contrib/sendmail/cf/mailer/usenet.m4 stable/7/contrib/sendmail/cf/mailer/uucp.m4 stable/7/contrib/sendmail/cf/ostype/a-ux.m4 stable/7/contrib/sendmail/cf/ostype/aix3.m4 stable/7/contrib/sendmail/cf/ostype/aix4.m4 stable/7/contrib/sendmail/cf/ostype/aix5.m4 stable/7/contrib/sendmail/cf/ostype/altos.m4 stable/7/contrib/sendmail/cf/ostype/amdahl-uts.m4 stable/7/contrib/sendmail/cf/ostype/bsd4.3.m4 stable/7/contrib/sendmail/cf/ostype/bsd4.4.m4 stable/7/contrib/sendmail/cf/ostype/bsdi.m4 stable/7/contrib/sendmail/cf/ostype/bsdi1.0.m4 stable/7/contrib/sendmail/cf/ostype/bsdi2.0.m4 stable/7/contrib/sendmail/cf/ostype/darwin.m4 stable/7/contrib/sendmail/cf/ostype/dgux.m4 stable/7/contrib/sendmail/cf/ostype/domainos.m4 stable/7/contrib/sendmail/cf/ostype/dragonfly.m4 stable/7/contrib/sendmail/cf/ostype/dynix3.2.m4 stable/7/contrib/sendmail/cf/ostype/freebsd4.m4 stable/7/contrib/sendmail/cf/ostype/freebsd5.m4 stable/7/contrib/sendmail/cf/ostype/freebsd6.m4 stable/7/contrib/sendmail/cf/ostype/gnu.m4 stable/7/contrib/sendmail/cf/ostype/hpux10.m4 stable/7/contrib/sendmail/cf/ostype/hpux11.m4 stable/7/contrib/sendmail/cf/ostype/hpux9.m4 stable/7/contrib/sendmail/cf/ostype/irix4.m4 stable/7/contrib/sendmail/cf/ostype/irix5.m4 stable/7/contrib/sendmail/cf/ostype/irix6.m4 stable/7/contrib/sendmail/cf/ostype/isc4.1.m4 stable/7/contrib/sendmail/cf/ostype/linux.m4 stable/7/contrib/sendmail/cf/ostype/maxion.m4 stable/7/contrib/sendmail/cf/ostype/mklinux.m4 stable/7/contrib/sendmail/cf/ostype/mpeix.m4 stable/7/contrib/sendmail/cf/ostype/nextstep.m4 stable/7/contrib/sendmail/cf/ostype/openbsd.m4 stable/7/contrib/sendmail/cf/ostype/osf1.m4 stable/7/contrib/sendmail/cf/ostype/powerux.m4 stable/7/contrib/sendmail/cf/ostype/ptx2.m4 stable/7/contrib/sendmail/cf/ostype/qnx.m4 stable/7/contrib/sendmail/cf/ostype/riscos4.5.m4 stable/7/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 stable/7/contrib/sendmail/cf/ostype/sco3.2.m4 stable/7/contrib/sendmail/cf/ostype/sinix.m4 stable/7/contrib/sendmail/cf/ostype/solaris11.m4 stable/7/contrib/sendmail/cf/ostype/solaris2.m4 stable/7/contrib/sendmail/cf/ostype/solaris2.ml.m4 stable/7/contrib/sendmail/cf/ostype/solaris2.pre5.m4 stable/7/contrib/sendmail/cf/ostype/solaris8.m4 stable/7/contrib/sendmail/cf/ostype/sunos3.5.m4 stable/7/contrib/sendmail/cf/ostype/sunos4.1.m4 stable/7/contrib/sendmail/cf/ostype/svr4.m4 stable/7/contrib/sendmail/cf/ostype/ultrix4.m4 stable/7/contrib/sendmail/cf/ostype/unicos.m4 stable/7/contrib/sendmail/cf/ostype/unicosmk.m4 stable/7/contrib/sendmail/cf/ostype/unicosmp.m4 stable/7/contrib/sendmail/cf/ostype/unixware7.m4 stable/7/contrib/sendmail/cf/ostype/unknown.m4 stable/7/contrib/sendmail/cf/ostype/uxpds.m4 stable/7/contrib/sendmail/cf/sendmail.schema stable/7/contrib/sendmail/cf/sh/makeinfo.sh stable/7/contrib/sendmail/contrib/README stable/7/contrib/sendmail/contrib/bsdi.mc stable/7/contrib/sendmail/contrib/buildvirtuser stable/7/contrib/sendmail/contrib/cidrexpand stable/7/contrib/sendmail/contrib/dnsblaccess.m4 stable/7/contrib/sendmail/contrib/link_hash.sh stable/7/contrib/sendmail/contrib/qtool.8 stable/7/contrib/sendmail/contrib/qtool.pl stable/7/contrib/sendmail/contrib/smcontrol.pl stable/7/contrib/sendmail/contrib/socketmapClient.pl stable/7/contrib/sendmail/contrib/socketmapServer.pl stable/7/contrib/sendmail/doc/op/Makefile stable/7/contrib/sendmail/doc/op/README stable/7/contrib/sendmail/doc/op/op.me stable/7/contrib/sendmail/editmap/Makefile stable/7/contrib/sendmail/editmap/Makefile.m4 stable/7/contrib/sendmail/editmap/editmap.8 stable/7/contrib/sendmail/editmap/editmap.c stable/7/contrib/sendmail/include/libmilter/mfapi.h stable/7/contrib/sendmail/include/libmilter/mfdef.h stable/7/contrib/sendmail/include/libmilter/milter.h stable/7/contrib/sendmail/include/libsmdb/smdb.h stable/7/contrib/sendmail/include/sendmail/mailstats.h stable/7/contrib/sendmail/include/sendmail/pathnames.h stable/7/contrib/sendmail/include/sendmail/sendmail.h stable/7/contrib/sendmail/include/sm/assert.h stable/7/contrib/sendmail/include/sm/bdb.h stable/7/contrib/sendmail/include/sm/bitops.h stable/7/contrib/sendmail/include/sm/cdefs.h stable/7/contrib/sendmail/include/sm/cf.h stable/7/contrib/sendmail/include/sm/clock.h stable/7/contrib/sendmail/include/sm/conf.h stable/7/contrib/sendmail/include/sm/config.h stable/7/contrib/sendmail/include/sm/debug.h stable/7/contrib/sendmail/include/sm/errstring.h stable/7/contrib/sendmail/include/sm/exc.h stable/7/contrib/sendmail/include/sm/fdset.h stable/7/contrib/sendmail/include/sm/gen.h stable/7/contrib/sendmail/include/sm/heap.h stable/7/contrib/sendmail/include/sm/io.h stable/7/contrib/sendmail/include/sm/ldap.h stable/7/contrib/sendmail/include/sm/limits.h stable/7/contrib/sendmail/include/sm/mbdb.h stable/7/contrib/sendmail/include/sm/misc.h stable/7/contrib/sendmail/include/sm/os/sm_os_aix.h stable/7/contrib/sendmail/include/sm/os/sm_os_dragonfly.h stable/7/contrib/sendmail/include/sm/os/sm_os_freebsd.h stable/7/contrib/sendmail/include/sm/os/sm_os_hp.h stable/7/contrib/sendmail/include/sm/os/sm_os_irix.h stable/7/contrib/sendmail/include/sm/os/sm_os_linux.h stable/7/contrib/sendmail/include/sm/os/sm_os_mpeix.h stable/7/contrib/sendmail/include/sm/os/sm_os_next.h stable/7/contrib/sendmail/include/sm/os/sm_os_openbsd.h stable/7/contrib/sendmail/include/sm/os/sm_os_openunix.h stable/7/contrib/sendmail/include/sm/os/sm_os_osf1.h stable/7/contrib/sendmail/include/sm/os/sm_os_qnx.h stable/7/contrib/sendmail/include/sm/os/sm_os_sunos.h stable/7/contrib/sendmail/include/sm/os/sm_os_ultrix.h stable/7/contrib/sendmail/include/sm/os/sm_os_unicos.h stable/7/contrib/sendmail/include/sm/os/sm_os_unicosmk.h stable/7/contrib/sendmail/include/sm/os/sm_os_unicosmp.h stable/7/contrib/sendmail/include/sm/os/sm_os_unixware.h stable/7/contrib/sendmail/include/sm/path.h stable/7/contrib/sendmail/include/sm/rpool.h stable/7/contrib/sendmail/include/sm/sem.h stable/7/contrib/sendmail/include/sm/setjmp.h stable/7/contrib/sendmail/include/sm/shm.h stable/7/contrib/sendmail/include/sm/signal.h stable/7/contrib/sendmail/include/sm/string.h stable/7/contrib/sendmail/include/sm/sysexits.h stable/7/contrib/sendmail/include/sm/tailq.h stable/7/contrib/sendmail/include/sm/test.h stable/7/contrib/sendmail/include/sm/time.h stable/7/contrib/sendmail/include/sm/types.h stable/7/contrib/sendmail/include/sm/varargs.h stable/7/contrib/sendmail/include/sm/xtrap.h stable/7/contrib/sendmail/libmilter/Makefile stable/7/contrib/sendmail/libmilter/Makefile.m4 stable/7/contrib/sendmail/libmilter/README stable/7/contrib/sendmail/libmilter/comm.c stable/7/contrib/sendmail/libmilter/docs/api.html stable/7/contrib/sendmail/libmilter/docs/design.html stable/7/contrib/sendmail/libmilter/docs/index.html stable/7/contrib/sendmail/libmilter/docs/installation.html stable/7/contrib/sendmail/libmilter/docs/other.html stable/7/contrib/sendmail/libmilter/docs/overview.html stable/7/contrib/sendmail/libmilter/docs/sample.html stable/7/contrib/sendmail/libmilter/docs/smfi_addheader.html stable/7/contrib/sendmail/libmilter/docs/smfi_addrcpt.html stable/7/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html stable/7/contrib/sendmail/libmilter/docs/smfi_chgfrom.html stable/7/contrib/sendmail/libmilter/docs/smfi_chgheader.html stable/7/contrib/sendmail/libmilter/docs/smfi_delrcpt.html stable/7/contrib/sendmail/libmilter/docs/smfi_getpriv.html stable/7/contrib/sendmail/libmilter/docs/smfi_getsymval.html stable/7/contrib/sendmail/libmilter/docs/smfi_insheader.html stable/7/contrib/sendmail/libmilter/docs/smfi_main.html stable/7/contrib/sendmail/libmilter/docs/smfi_opensocket.html stable/7/contrib/sendmail/libmilter/docs/smfi_progress.html stable/7/contrib/sendmail/libmilter/docs/smfi_quarantine.html stable/7/contrib/sendmail/libmilter/docs/smfi_register.html stable/7/contrib/sendmail/libmilter/docs/smfi_replacebody.html stable/7/contrib/sendmail/libmilter/docs/smfi_setbacklog.html stable/7/contrib/sendmail/libmilter/docs/smfi_setconn.html stable/7/contrib/sendmail/libmilter/docs/smfi_setdbg.html stable/7/contrib/sendmail/libmilter/docs/smfi_setmlreply.html stable/7/contrib/sendmail/libmilter/docs/smfi_setpriv.html stable/7/contrib/sendmail/libmilter/docs/smfi_setreply.html stable/7/contrib/sendmail/libmilter/docs/smfi_setsymlist.html stable/7/contrib/sendmail/libmilter/docs/smfi_settimeout.html stable/7/contrib/sendmail/libmilter/docs/smfi_stop.html stable/7/contrib/sendmail/libmilter/docs/smfi_version.html stable/7/contrib/sendmail/libmilter/docs/xxfi_abort.html stable/7/contrib/sendmail/libmilter/docs/xxfi_body.html stable/7/contrib/sendmail/libmilter/docs/xxfi_close.html stable/7/contrib/sendmail/libmilter/docs/xxfi_connect.html stable/7/contrib/sendmail/libmilter/docs/xxfi_data.html stable/7/contrib/sendmail/libmilter/docs/xxfi_envfrom.html stable/7/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html stable/7/contrib/sendmail/libmilter/docs/xxfi_eoh.html stable/7/contrib/sendmail/libmilter/docs/xxfi_eom.html stable/7/contrib/sendmail/libmilter/docs/xxfi_header.html stable/7/contrib/sendmail/libmilter/docs/xxfi_helo.html stable/7/contrib/sendmail/libmilter/docs/xxfi_negotiate.html stable/7/contrib/sendmail/libmilter/docs/xxfi_unknown.html stable/7/contrib/sendmail/libmilter/engine.c stable/7/contrib/sendmail/libmilter/example.c stable/7/contrib/sendmail/libmilter/handler.c stable/7/contrib/sendmail/libmilter/libmilter.h stable/7/contrib/sendmail/libmilter/listener.c stable/7/contrib/sendmail/libmilter/main.c stable/7/contrib/sendmail/libmilter/monitor.c stable/7/contrib/sendmail/libmilter/signal.c stable/7/contrib/sendmail/libmilter/sm_gethost.c stable/7/contrib/sendmail/libmilter/smfi.c stable/7/contrib/sendmail/libmilter/worker.c stable/7/contrib/sendmail/libsm/Makefile stable/7/contrib/sendmail/libsm/Makefile.m4 stable/7/contrib/sendmail/libsm/README stable/7/contrib/sendmail/libsm/assert.c stable/7/contrib/sendmail/libsm/assert.html stable/7/contrib/sendmail/libsm/b-strcmp.c stable/7/contrib/sendmail/libsm/b-strl.c stable/7/contrib/sendmail/libsm/cdefs.html stable/7/contrib/sendmail/libsm/cf.c stable/7/contrib/sendmail/libsm/clock.c stable/7/contrib/sendmail/libsm/clrerr.c stable/7/contrib/sendmail/libsm/config.c stable/7/contrib/sendmail/libsm/debug.c stable/7/contrib/sendmail/libsm/debug.html stable/7/contrib/sendmail/libsm/errstring.c stable/7/contrib/sendmail/libsm/exc.c stable/7/contrib/sendmail/libsm/exc.html stable/7/contrib/sendmail/libsm/fclose.c stable/7/contrib/sendmail/libsm/feof.c stable/7/contrib/sendmail/libsm/ferror.c stable/7/contrib/sendmail/libsm/fflush.c stable/7/contrib/sendmail/libsm/fget.c stable/7/contrib/sendmail/libsm/findfp.c stable/7/contrib/sendmail/libsm/flags.c stable/7/contrib/sendmail/libsm/fopen.c stable/7/contrib/sendmail/libsm/fpos.c stable/7/contrib/sendmail/libsm/fprintf.c stable/7/contrib/sendmail/libsm/fpurge.c stable/7/contrib/sendmail/libsm/fput.c stable/7/contrib/sendmail/libsm/fread.c stable/7/contrib/sendmail/libsm/fscanf.c stable/7/contrib/sendmail/libsm/fseek.c stable/7/contrib/sendmail/libsm/fvwrite.c stable/7/contrib/sendmail/libsm/fvwrite.h stable/7/contrib/sendmail/libsm/fwalk.c stable/7/contrib/sendmail/libsm/fwrite.c stable/7/contrib/sendmail/libsm/gen.html stable/7/contrib/sendmail/libsm/get.c stable/7/contrib/sendmail/libsm/glue.h stable/7/contrib/sendmail/libsm/heap.c stable/7/contrib/sendmail/libsm/heap.html stable/7/contrib/sendmail/libsm/index.html stable/7/contrib/sendmail/libsm/inet6_ntop.c stable/7/contrib/sendmail/libsm/io.html stable/7/contrib/sendmail/libsm/ldap.c stable/7/contrib/sendmail/libsm/local.h stable/7/contrib/sendmail/libsm/makebuf.c stable/7/contrib/sendmail/libsm/match.c stable/7/contrib/sendmail/libsm/mbdb.c stable/7/contrib/sendmail/libsm/memstat.c stable/7/contrib/sendmail/libsm/mpeix.c stable/7/contrib/sendmail/libsm/niprop.c stable/7/contrib/sendmail/libsm/path.c stable/7/contrib/sendmail/libsm/put.c stable/7/contrib/sendmail/libsm/refill.c stable/7/contrib/sendmail/libsm/rewind.c stable/7/contrib/sendmail/libsm/rpool.c stable/7/contrib/sendmail/libsm/rpool.html stable/7/contrib/sendmail/libsm/sem.c stable/7/contrib/sendmail/libsm/setvbuf.c stable/7/contrib/sendmail/libsm/shm.c stable/7/contrib/sendmail/libsm/signal.c stable/7/contrib/sendmail/libsm/smstdio.c stable/7/contrib/sendmail/libsm/snprintf.c stable/7/contrib/sendmail/libsm/sscanf.c stable/7/contrib/sendmail/libsm/stdio.c stable/7/contrib/sendmail/libsm/strcasecmp.c stable/7/contrib/sendmail/libsm/strdup.c stable/7/contrib/sendmail/libsm/strerror.c stable/7/contrib/sendmail/libsm/strexit.c stable/7/contrib/sendmail/libsm/string.c stable/7/contrib/sendmail/libsm/stringf.c stable/7/contrib/sendmail/libsm/strio.c stable/7/contrib/sendmail/libsm/strl.c stable/7/contrib/sendmail/libsm/strrevcmp.c stable/7/contrib/sendmail/libsm/strto.c stable/7/contrib/sendmail/libsm/syslogio.c stable/7/contrib/sendmail/libsm/t-cf.c stable/7/contrib/sendmail/libsm/t-event.c stable/7/contrib/sendmail/libsm/t-exc.c stable/7/contrib/sendmail/libsm/t-fget.c stable/7/contrib/sendmail/libsm/t-float.c stable/7/contrib/sendmail/libsm/t-fopen.c stable/7/contrib/sendmail/libsm/t-heap.c stable/7/contrib/sendmail/libsm/t-inet6_ntop.c stable/7/contrib/sendmail/libsm/t-match.c stable/7/contrib/sendmail/libsm/t-memstat.c stable/7/contrib/sendmail/libsm/t-path.c stable/7/contrib/sendmail/libsm/t-qic.c stable/7/contrib/sendmail/libsm/t-rpool.c stable/7/contrib/sendmail/libsm/t-scanf.c stable/7/contrib/sendmail/libsm/t-sem.c stable/7/contrib/sendmail/libsm/t-shm.c stable/7/contrib/sendmail/libsm/t-smstdio.c stable/7/contrib/sendmail/libsm/t-string.c stable/7/contrib/sendmail/libsm/t-strio.c stable/7/contrib/sendmail/libsm/t-strl.c stable/7/contrib/sendmail/libsm/t-strrevcmp.c stable/7/contrib/sendmail/libsm/t-types.c stable/7/contrib/sendmail/libsm/test.c stable/7/contrib/sendmail/libsm/ungetc.c stable/7/contrib/sendmail/libsm/util.c stable/7/contrib/sendmail/libsm/vasprintf.c stable/7/contrib/sendmail/libsm/vfprintf.c stable/7/contrib/sendmail/libsm/vfscanf.c stable/7/contrib/sendmail/libsm/vprintf.c stable/7/contrib/sendmail/libsm/vsnprintf.c stable/7/contrib/sendmail/libsm/wbuf.c stable/7/contrib/sendmail/libsm/wsetup.c stable/7/contrib/sendmail/libsm/xtrap.c stable/7/contrib/sendmail/libsmdb/Makefile stable/7/contrib/sendmail/libsmdb/Makefile.m4 stable/7/contrib/sendmail/libsmdb/smdb.c stable/7/contrib/sendmail/libsmdb/smdb1.c stable/7/contrib/sendmail/libsmdb/smdb2.c stable/7/contrib/sendmail/libsmdb/smndbm.c stable/7/contrib/sendmail/libsmutil/Makefile stable/7/contrib/sendmail/libsmutil/Makefile.m4 stable/7/contrib/sendmail/libsmutil/cf.c stable/7/contrib/sendmail/libsmutil/debug.c stable/7/contrib/sendmail/libsmutil/err.c stable/7/contrib/sendmail/libsmutil/lockfile.c stable/7/contrib/sendmail/libsmutil/safefile.c stable/7/contrib/sendmail/libsmutil/snprintf.c stable/7/contrib/sendmail/mail.local/Makefile stable/7/contrib/sendmail/mail.local/Makefile.m4 stable/7/contrib/sendmail/mail.local/README stable/7/contrib/sendmail/mail.local/mail.local.8 stable/7/contrib/sendmail/mail.local/mail.local.c stable/7/contrib/sendmail/mailstats/Makefile stable/7/contrib/sendmail/mailstats/Makefile.m4 stable/7/contrib/sendmail/mailstats/mailstats.8 stable/7/contrib/sendmail/mailstats/mailstats.c stable/7/contrib/sendmail/makemap/Makefile stable/7/contrib/sendmail/makemap/Makefile.m4 stable/7/contrib/sendmail/makemap/makemap.8 stable/7/contrib/sendmail/makemap/makemap.c stable/7/contrib/sendmail/praliases/Makefile stable/7/contrib/sendmail/praliases/Makefile.m4 stable/7/contrib/sendmail/praliases/praliases.8 stable/7/contrib/sendmail/praliases/praliases.c stable/7/contrib/sendmail/rmail/Makefile stable/7/contrib/sendmail/rmail/Makefile.m4 stable/7/contrib/sendmail/rmail/rmail.8 stable/7/contrib/sendmail/rmail/rmail.c stable/7/contrib/sendmail/smrsh/Makefile stable/7/contrib/sendmail/smrsh/Makefile.m4 stable/7/contrib/sendmail/smrsh/README stable/7/contrib/sendmail/smrsh/smrsh.8 stable/7/contrib/sendmail/smrsh/smrsh.c stable/7/contrib/sendmail/src/Makefile stable/7/contrib/sendmail/src/Makefile.m4 stable/7/contrib/sendmail/src/README stable/7/contrib/sendmail/src/SECURITY stable/7/contrib/sendmail/src/TRACEFLAGS stable/7/contrib/sendmail/src/TUNING stable/7/contrib/sendmail/src/alias.c stable/7/contrib/sendmail/src/aliases stable/7/contrib/sendmail/src/aliases.5 stable/7/contrib/sendmail/src/arpadate.c stable/7/contrib/sendmail/src/bf.c stable/7/contrib/sendmail/src/bf.h stable/7/contrib/sendmail/src/collect.c stable/7/contrib/sendmail/src/conf.c stable/7/contrib/sendmail/src/conf.h stable/7/contrib/sendmail/src/control.c stable/7/contrib/sendmail/src/convtime.c stable/7/contrib/sendmail/src/daemon.c stable/7/contrib/sendmail/src/daemon.h stable/7/contrib/sendmail/src/deliver.c stable/7/contrib/sendmail/src/domain.c stable/7/contrib/sendmail/src/envelope.c stable/7/contrib/sendmail/src/err.c stable/7/contrib/sendmail/src/headers.c stable/7/contrib/sendmail/src/helpfile stable/7/contrib/sendmail/src/macro.c stable/7/contrib/sendmail/src/mailq.1 stable/7/contrib/sendmail/src/main.c stable/7/contrib/sendmail/src/map.c stable/7/contrib/sendmail/src/map.h stable/7/contrib/sendmail/src/mci.c stable/7/contrib/sendmail/src/milter.c stable/7/contrib/sendmail/src/mime.c stable/7/contrib/sendmail/src/newaliases.1 stable/7/contrib/sendmail/src/parseaddr.c stable/7/contrib/sendmail/src/queue.c stable/7/contrib/sendmail/src/ratectrl.c stable/7/contrib/sendmail/src/readcf.c stable/7/contrib/sendmail/src/recipient.c stable/7/contrib/sendmail/src/sasl.c stable/7/contrib/sendmail/src/savemail.c stable/7/contrib/sendmail/src/sendmail.8 stable/7/contrib/sendmail/src/sendmail.h stable/7/contrib/sendmail/src/sfsasl.c stable/7/contrib/sendmail/src/sfsasl.h stable/7/contrib/sendmail/src/shmticklib.c stable/7/contrib/sendmail/src/sm_resolve.c stable/7/contrib/sendmail/src/sm_resolve.h stable/7/contrib/sendmail/src/srvrsmtp.c stable/7/contrib/sendmail/src/stab.c stable/7/contrib/sendmail/src/stats.c stable/7/contrib/sendmail/src/statusd_shm.h stable/7/contrib/sendmail/src/sysexits.c stable/7/contrib/sendmail/src/timers.c stable/7/contrib/sendmail/src/timers.h stable/7/contrib/sendmail/src/tls.c stable/7/contrib/sendmail/src/trace.c stable/7/contrib/sendmail/src/udb.c stable/7/contrib/sendmail/src/usersmtp.c stable/7/contrib/sendmail/src/util.c stable/7/contrib/sendmail/src/version.c stable/7/contrib/sendmail/test/Makefile stable/7/contrib/sendmail/test/Makefile.m4 stable/7/contrib/sendmail/test/README stable/7/contrib/sendmail/test/Results stable/7/contrib/sendmail/test/t_dropgid.c stable/7/contrib/sendmail/test/t_exclopen.c stable/7/contrib/sendmail/test/t_pathconf.c stable/7/contrib/sendmail/test/t_seteuid.c stable/7/contrib/sendmail/test/t_setgid.c stable/7/contrib/sendmail/test/t_setreuid.c stable/7/contrib/sendmail/test/t_setuid.c stable/7/contrib/sendmail/test/t_snprintf.c stable/7/contrib/sendmail/vacation/Makefile stable/7/contrib/sendmail/vacation/Makefile.m4 stable/7/contrib/sendmail/vacation/vacation.1 stable/7/contrib/sendmail/vacation/vacation.c Directory Properties: stable/7/contrib/sendmail/ (props changed) Modified: stable/7/contrib/sendmail/CACerts ============================================================================== --- stable/7/contrib/sendmail/CACerts Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/CACerts Mon May 26 15:31:26 2014 (r266694) @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.6 2013/01/18 15:14:17 ca Exp $ +# $Id: CACerts,v 8.6 2013-01-18 15:14:17 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. Modified: stable/7/contrib/sendmail/FAQ ============================================================================== --- stable/7/contrib/sendmail/FAQ Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/FAQ Mon May 26 15:31:26 2014 (r266694) @@ -5,4 +5,4 @@ A plain-text version of the questions on the answers, is posted to comp.mail.sendmail on the 10th and 25th of each month. -$Revision: 8.24 $, Last updated $Date: 1999/02/07 03:21:03 $ +$Revision: 8.24 $, Last updated $Date: 1999-02-07 03:21:03 $ Modified: stable/7/contrib/sendmail/INSTALL ============================================================================== --- stable/7/contrib/sendmail/INSTALL Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/INSTALL Mon May 26 15:31:26 2014 (r266694) @@ -43,4 +43,4 @@ sendmail/SECURITY for more installation in case you are now using a different (and thereby incompatible) version of Berkeley DB. -$Revision: 8.16 $, Last updated $Date: 2007/10/03 21:00:28 $ +$Revision: 8.16 $, Last updated $Date: 2007-10-03 21:00:28 $ Modified: stable/7/contrib/sendmail/KNOWNBUGS ============================================================================== --- stable/7/contrib/sendmail/KNOWNBUGS Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/KNOWNBUGS Mon May 26 15:31:26 2014 (r266694) @@ -266,4 +266,4 @@ Kresolve sequence dnsmx canon be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.61 $, Last updated $Date: 2011/04/07 17:48:23 $ +$Revision: 8.61 $, Last updated $Date: 2011-04-07 17:48:23 $ Modified: stable/7/contrib/sendmail/LICENSE ============================================================================== --- stable/7/contrib/sendmail/LICENSE Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/LICENSE Mon May 26 15:31:26 2014 (r266694) @@ -35,7 +35,7 @@ each of the following conditions is met: forth as paragraph 6 below, in the documentation and/or other materials provided with the distribution. For the purposes of binary distribution the "Copyright Notice" refers to the following language: - "Copyright (c) 1998-2013 Proofpoint, Inc. All rights reserved." + "Copyright (c) 1998-2014 Proofpoint, Inc. All rights reserved." 4. Neither the name of Proofpoint, Inc. nor the University of California nor names of their contributors may be used to endorse or promote @@ -78,4 +78,4 @@ each of the following conditions is met: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -$Revision: 8.22 $, Last updated $Date: 2013/11/23 04:37:36 $, Document 139848.1 +$Revision: 8.23 $, Last updated $Date: 2014-01-26 20:10:01 $, Document 139848.1 Modified: stable/7/contrib/sendmail/Makefile ============================================================================== --- stable/7/contrib/sendmail/Makefile Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/Makefile Mon May 26 15:31:26 2014 (r266694) @@ -1,4 +1,4 @@ -# $Id: Makefile.dist,v 8.15 2001/08/23 20:44:39 ca Exp $ +# $Id: Makefile.dist,v 8.15 2001-08-23 20:44:39 ca Exp $ SHELL= /bin/sh SUBDIRS= libsm libsmutil libsmdb sendmail editmap mail.local \ Modified: stable/7/contrib/sendmail/PGPKEYS ============================================================================== --- stable/7/contrib/sendmail/PGPKEYS Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/PGPKEYS Mon May 26 15:31:26 2014 (r266694) @@ -2613,4 +2613,4 @@ DnF3FZZEzV7oqPwC2jzv/1dD6GFhtgy0cnyoPGUJ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.46 $, Last updated $Date: 2014/01/18 00:20:24 $ +$Revision: 8.46 $, Last updated $Date: 2014-01-18 00:20:24 $ Modified: stable/7/contrib/sendmail/README ============================================================================== --- stable/7/contrib/sendmail/README Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/README Mon May 26 15:31:26 2014 (r266694) @@ -465,4 +465,4 @@ sendmail Source for the sendmail program test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.96 $, Last updated $Date: 2013/11/22 20:51:01 $ +$Revision: 8.96 $, Last updated $Date: 2013-11-22 20:51:01 $ Modified: stable/7/contrib/sendmail/RELEASE_NOTES ============================================================================== --- stable/7/contrib/sendmail/RELEASE_NOTES Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/RELEASE_NOTES Mon May 26 15:31:26 2014 (r266694) @@ -1,11 +1,20 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.2043 2014/01/23 20:27:19 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.9/8.14.9 2014/05/21 + SECURITY: Properly set the close-on-exec flag for file descriptors + (except stdin, stdout, and stderr) before executing mailers. + Fix a misformed comment in conf.c: "/*" within comment + which may cause a compilation error on some systems. + Problem reported by John Beck of Oracle. + DEVTOOLS: Fix regression in auto-detection of libraries when only + shared libraries are available. Problem reported by + Bryan Costales. + 8.14.8/8.14.8 2014/01/26 Properly initialize all OpenSSL algorithms for versions before OpenSSL 0.9.8o. Without this SHA2 algorithms may not Modified: stable/7/contrib/sendmail/cf/README ============================================================================== --- stable/7/contrib/sendmail/cf/README Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/README Mon May 26 15:31:26 2014 (r266694) @@ -4704,4 +4704,4 @@ M4 DIVERSIONS 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.730 $, Last updated $Date: 2014/01/16 15:55:51 $ +$Revision: 8.730 $, Last updated $Date: 2014-01-16 15:55:51 $ Modified: stable/7/contrib/sendmail/cf/cf/Makefile ============================================================================== --- stable/7/contrib/sendmail/cf/cf/Makefile Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/Makefile Mon May 26 15:31:26 2014 (r266694) @@ -1,7 +1,7 @@ # # Makefile for configuration files. # -# $Id: Makefile,v 8.60 2005/06/14 02:16:34 gshapiro Exp $ +# $Id: Makefile,v 8.60 2005-06-14 02:16:34 gshapiro Exp $ # # Modified: stable/7/contrib/sendmail/cf/cf/README ============================================================================== --- stable/7/contrib/sendmail/cf/cf/README Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/README Mon May 26 15:31:26 2014 (r266694) @@ -31,4 +31,4 @@ The name of the source file for "submit. For more details see Makefile. -$Revision: 1.2 $, Last updated $Date: 2002/02/22 00:33:54 $ +$Revision: 1.2 $, Last updated $Date: 2002-02-22 00:33:54 $ Modified: stable/7/contrib/sendmail/cf/cf/chez.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/chez.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/chez.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -24,7 +24,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: chez.cs.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: chez.cs.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') OSTYPE(bsd4.4)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/clientproto.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/clientproto.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/clientproto.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: clientproto.mc,v 8.17 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: clientproto.mc,v 8.17 2013-11-22 20:51:08 ca Exp $') OSTYPE(unknown) FEATURE(nullclient, mailhost.$m) Modified: stable/7/contrib/sendmail/cf/cf/cs-hpux10.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-hpux10.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-hpux10.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-hpux10.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-hpux10.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(hpux10)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/cs-hpux9.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-hpux9.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-hpux9.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-hpux9.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-hpux9.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') OSTYPE(hpux9)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/cs-osf1.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-osf1.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-osf1.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-osf1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-osf1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(osf1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/cs-solaris2.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-solaris2.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-solaris2.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-solaris2.mc,v 8.13 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-solaris2.mc,v 8.13 2013-11-22 20:51:08 ca Exp $') OSTYPE(solaris2)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/cs-sunos4.1.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-sunos4.1.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-sunos4.1.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-sunos4.1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-sunos4.1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(sunos4.1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/cs-ultrix4.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cs-ultrix4.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cs-ultrix4.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cs-ultrix4.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: cs-ultrix4.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(ultrix4)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/cyrusproto.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/cyrusproto.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/cyrusproto.mc Mon May 26 15:31:26 2014 (r266694) @@ -27,7 +27,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: cyrusproto.mc,v 8.7 1999/09/07 14:57:10 ca Exp $') +VERSIONID(`$Id: cyrusproto.mc,v 8.7 1999-09-07 14:57:10 ca Exp $') define(`confBIND_OPTS',`-DNSRCH -DEFNAMES') define(`confLOCAL_MAILER', `cyrus') FEATURE(`nocanonify') Modified: stable/7/contrib/sendmail/cf/cf/generic-bsd4.4.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-bsd4.4.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-bsd4.4.mc Mon May 26 15:31:26 2014 (r266694) @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-bsd4.4.mc,v 8.11 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-bsd4.4.mc,v 8.11 2013-11-22 20:51:08 ca Exp $') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-hpux10.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-hpux10.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-hpux10.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-hpux10.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-hpux10.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(hpux10)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-hpux9.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-hpux9.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-hpux9.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-hpux9.mc,v 8.12 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-hpux9.mc,v 8.12 2013-11-22 20:51:08 ca Exp $') OSTYPE(hpux9)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-linux.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-linux.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-linux.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-linux.mc,v 8.2 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-linux.mc,v 8.2 2013-11-22 20:51:08 ca Exp $') OSTYPE(linux)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-mpeix.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-mpeix.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-mpeix.mc Mon May 26 15:31:26 2014 (r266694) @@ -17,7 +17,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-mpeix.mc,v 8.2 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-mpeix.mc,v 8.2 2013-11-22 20:51:08 ca Exp $') OSTYPE(mpeix)dnl DOMAIN(generic)dnl define(`confFORWARD_PATH', `$z/.forward')dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-nextstep3.3.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-nextstep3.3.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-nextstep3.3.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.11 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.11 2013-11-22 20:51:08 ca Exp $') OSTYPE(nextstep)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-osf1.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-osf1.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-osf1.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-osf1.mc,v 8.12 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-osf1.mc,v 8.12 2013-11-22 20:51:08 ca Exp $') OSTYPE(osf1)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-solaris.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-solaris.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-solaris.mc Mon May 26 15:31:26 2014 (r266694) @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-solaris.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-solaris.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(solaris2)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-sunos4.1.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-sunos4.1.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-sunos4.1.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-sunos4.1.mc,v 8.12 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-sunos4.1.mc,v 8.12 2013-11-22 20:51:08 ca Exp $') OSTYPE(sunos4.1)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/generic-ultrix4.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/generic-ultrix4.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/generic-ultrix4.mc Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: generic-ultrix4.mc,v 8.12 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: generic-ultrix4.mc,v 8.12 2013-11-22 20:51:08 ca Exp $') OSTYPE(ultrix4)dnl DOMAIN(generic)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/huginn.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/huginn.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/huginn.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: huginn.cs.mc,v 8.16 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: huginn.cs.mc,v 8.16 2013-11-22 20:51:08 ca Exp $') OSTYPE(hpux9)dnl DOMAIN(CS.Berkeley.EDU)dnl MASQUERADE_AS(CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/knecht.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/knecht.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/knecht.mc Mon May 26 15:31:26 2014 (r266694) @@ -19,7 +19,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: knecht.mc,v 8.63 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: knecht.mc,v 8.63 2013-11-22 20:51:08 ca Exp $') OSTYPE(bsd4.4) DOMAIN(generic) Modified: stable/7/contrib/sendmail/cf/cf/mail.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/mail.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/mail.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: mail.cs.mc,v 8.19 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: mail.cs.mc,v 8.19 2013-11-22 20:51:08 ca Exp $') OSTYPE(ultrix4)dnl DOMAIN(Berkeley.EDU)dnl MASQUERADE_AS(CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/mail.eecs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/mail.eecs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/mail.eecs.mc Mon May 26 15:31:26 2014 (r266694) @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: mail.eecs.mc,v 8.19 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: mail.eecs.mc,v 8.19 2013-11-22 20:51:08 ca Exp $') OSTYPE(ultrix4)dnl DOMAIN(EECS.Berkeley.EDU)dnl MASQUERADE_AS(EECS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/mailspool.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/mailspool.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/mailspool.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -24,7 +24,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: mailspool.cs.mc,v 8.13 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: mailspool.cs.mc,v 8.13 2013-11-22 20:51:08 ca Exp $') OSTYPE(sunos4.1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/python.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/python.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/python.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -24,7 +24,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: python.cs.mc,v 8.13 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: python.cs.mc,v 8.13 2013-11-22 20:51:08 ca Exp $') OSTYPE(bsd4.4)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/cf/s2k-osf1.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/s2k-osf1.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/s2k-osf1.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: s2k-osf1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: s2k-osf1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(osf1)dnl DOMAIN(S2K.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/s2k-ultrix4.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/s2k-ultrix4.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/s2k-ultrix4.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: s2k-ultrix4.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: s2k-ultrix4.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') OSTYPE(ultrix4)dnl DOMAIN(S2K.Berkeley.EDU)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/submit.cf ============================================================================== --- stable/7/contrib/sendmail/cf/cf/submit.cf Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/submit.cf Mon May 26 15:31:26 2014 (r266694) @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by ca@lab.smi.sendmail.com on Thu Jan 23 12:29:13 PST 2014 -##### in /home/ca/sm8-rel/sm-8.14.8/OpenSource/sendmail-8.14.8/cf/cf +##### built by ca@lab.smi.sendmail.com on Tue May 20 12:12:52 PDT 2014 +##### in /home/ca/sm8.git/sendmail/OpenSource/sendmail-8.14.9/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -27,15 +27,15 @@ ###################################################################### ###################################################################### -##### $Id: cfhead.m4,v 8.122 2013/11/22 20:51:13 ca Exp $ ##### -##### $Id: cf.m4,v 8.33 2013/11/22 20:51:13 ca Exp $ ##### -##### $Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $ ##### -##### $Id: msp.m4,v 1.34 2013/11/22 20:51:11 ca Exp $ ##### +##### $Id: cfhead.m4,v 8.122 2013-11-22 20:51:13 ca Exp $ ##### +##### $Id: cf.m4,v 8.33 2013-11-22 20:51:13 ca Exp $ ##### +##### $Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $ ##### +##### $Id: msp.m4,v 1.34 2013-11-22 20:51:11 ca Exp $ ##### -##### $Id: no_default_msa.m4,v 8.3 2013/11/22 20:51:11 ca Exp $ ##### +##### $Id: no_default_msa.m4,v 8.3 2013-11-22 20:51:11 ca Exp $ ##### -##### $Id: proto.m4,v 8.762 2013/11/22 20:51:13 ca Exp $ ##### +##### $Id: proto.m4,v 8.762 2013-11-22 20:51:13 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1] # Configuration version number -DZ8.14.8/Submit +DZ8.14.9/Submit ############### @@ -1299,7 +1299,7 @@ R$* $#relay $@ ${MTAHost} $: $1 < @ $j ### Local and Program Mailer specification ### ################################################## -##### $Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $ ##### +##### $Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $ ##### # # Envelope sender rewriting @@ -1351,7 +1351,7 @@ Mprog, P=[IPC], F=lmDFMuXk5, S=EnvFromL ### SMTP Mailer specification ### ##################################### -##### $Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $ ##### +##### $Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $ ##### # # common sender and masquerading recipient rewriting @@ -1457,7 +1457,7 @@ Mrelay, P=[IPC], F=mDFMuXa8k, S=EnvFrom # # # # divert(0)dnl -# VERSIONID(`$Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +# VERSIONID(`$Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') # define(`confCF_VERSION', `Submit')dnl # define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining # define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet Modified: stable/7/contrib/sendmail/cf/cf/submit.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/submit.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/submit.mc Mon May 26 15:31:26 2014 (r266694) @@ -15,7 +15,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet Modified: stable/7/contrib/sendmail/cf/cf/tcpproto.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/tcpproto.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/tcpproto.mc Mon May 26 15:31:26 2014 (r266694) @@ -26,7 +26,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: tcpproto.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: tcpproto.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') OSTYPE(`unknown') FEATURE(`nouucp', `reject') MAILER(`local') Modified: stable/7/contrib/sendmail/cf/cf/ucbarpa.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/ucbarpa.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/ucbarpa.mc Mon May 26 15:31:26 2014 (r266694) @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: ucbarpa.mc,v 8.13 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: ucbarpa.mc,v 8.13 2013-11-22 20:51:08 ca Exp $') DOMAIN(CS.Berkeley.EDU)dnl OSTYPE(bsd4.4)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/cf/ucbvax.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/ucbvax.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/ucbvax.mc Mon May 26 15:31:26 2014 (r266694) @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: ucbvax.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: ucbvax.mc,v 8.15 2013-11-22 20:51:08 ca Exp $') OSTYPE(bsd4.3) DOMAIN(CS.Berkeley.EDU) MASQUERADE_AS(CS.Berkeley.EDU) Modified: stable/7/contrib/sendmail/cf/cf/uucpproto.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/uucpproto.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/uucpproto.mc Mon May 26 15:31:26 2014 (r266694) @@ -26,7 +26,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: uucpproto.mc,v 8.16 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: uucpproto.mc,v 8.16 2013-11-22 20:51:08 ca Exp $') OSTYPE(unknown) FEATURE(promiscuous_relay)dnl FEATURE(accept_unresolvable_domains)dnl Modified: stable/7/contrib/sendmail/cf/cf/vangogh.cs.mc ============================================================================== --- stable/7/contrib/sendmail/cf/cf/vangogh.cs.mc Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/cf/vangogh.cs.mc Mon May 26 15:31:26 2014 (r266694) @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: vangogh.cs.mc,v 8.14 2013/11/22 20:51:08 ca Exp $') +VERSIONID(`$Id: vangogh.cs.mc,v 8.14 2013-11-22 20:51:08 ca Exp $') DOMAIN(CS.Berkeley.EDU)dnl OSTYPE(bsd4.4)dnl MAILER(local)dnl Modified: stable/7/contrib/sendmail/cf/domain/Berkeley.EDU.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/Berkeley.EDU.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/Berkeley.EDU.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,7 +12,7 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: Berkeley.EDU.m4,v 8.18 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: Berkeley.EDU.m4,v 8.18 2013-11-22 20:51:10 ca Exp $') DOMAIN(berkeley-only)dnl define(`BITNET_RELAY', `bitnet-relay.Berkeley.EDU')dnl define(`UUCP_RELAY', `uucp-relay.Berkeley.EDU')dnl Modified: stable/7/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,7 +12,7 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: CS.Berkeley.EDU.m4,v 8.11 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: CS.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $') DOMAIN(Berkeley.EDU)dnl HACK(cssubdomain)dnl define(`confUSERDB_SPEC', Modified: stable/7/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,6 +12,6 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: EECS.Berkeley.EDU.m4,v 8.11 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: EECS.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $') DOMAIN(Berkeley.EDU)dnl MASQUERADE_AS(EECS.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,6 +12,6 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: S2K.Berkeley.EDU.m4,v 8.11 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: S2K.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $') DOMAIN(CS.Berkeley.EDU)dnl MASQUERADE_AS(postgres.Berkeley.EDU)dnl Modified: stable/7/contrib/sendmail/cf/domain/berkeley-only.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/berkeley-only.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/berkeley-only.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,7 +12,7 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: unspecified-domain.m4,v 8.11 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: unspecified-domain.m4,v 8.11 2013-11-22 20:51:10 ca Exp $') errprint(`*** ERROR: You are trying to use the Berkeley sample configuration') errprint(` files outside of the Computer Science Division at Berkeley.') errprint(` The configuration (.mc) files must be customized to reference') Modified: stable/7/contrib/sendmail/cf/domain/generic.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/domain/generic.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/domain/generic.m4 Mon May 26 15:31:26 2014 (r266694) @@ -20,7 +20,7 @@ divert(-1) # files. # divert(0) -VERSIONID(`$Id: generic.m4,v 8.16 2013/11/22 20:51:10 ca Exp $') +VERSIONID(`$Id: generic.m4,v 8.16 2013-11-22 20:51:10 ca Exp $') define(`confFORWARD_PATH', `$z/.forward.$w+$h:$z/.forward+$h:$z/.forward.$w:$z/.forward')dnl define(`confMAX_HEADERS_LENGTH', `32768')dnl FEATURE(`redirect')dnl Modified: stable/7/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: accept_unqualified_senders.m4,v 8.7 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: accept_unqualified_senders.m4,v 8.7 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_ACCEPT_UNQUALIFIED_SENDERS_', 1) Modified: stable/7/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: accept_unresolvable_domains.m4,v 8.11 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: accept_unresolvable_domains.m4,v 8.11 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_ACCEPT_UNRESOLVABLE_DOMAINS_', 1) Modified: stable/7/contrib/sendmail/cf/feature/access_db.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/access_db.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/access_db.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: access_db.m4,v 8.28 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: access_db.m4,v 8.28 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_ACCESS_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/allmasquerade.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/allmasquerade.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/allmasquerade.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: allmasquerade.m4,v 8.14 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: allmasquerade.m4,v 8.14 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', Modified: stable/7/contrib/sendmail/cf/feature/always_add_domain.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/always_add_domain.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/always_add_domain.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: always_add_domain.m4,v 8.12 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: always_add_domain.m4,v 8.12 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', Modified: stable/7/contrib/sendmail/cf/feature/authinfo.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/authinfo.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/authinfo.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: authinfo.m4,v 1.10 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: authinfo.m4,v 1.10 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_AUTHINFO_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/badmx.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/badmx.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/badmx.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: badmx.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: badmx.m4,v 1.2 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_BADMX_CHK_', 1) Modified: stable/7/contrib/sendmail/cf/feature/bestmx_is_local.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/bestmx_is_local.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/bestmx_is_local.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: bestmx_is_local.m4,v 8.27 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: bestmx_is_local.m4,v 8.27 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_BESTMX_IS_LOCAL_', _ARG_) Modified: stable/7/contrib/sendmail/cf/feature/bitdomain.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/bitdomain.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/bitdomain.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: bitdomain.m4,v 8.31 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: bitdomain.m4,v 8.31 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_BITDOMAIN_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/blacklist_recipients.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/blacklist_recipients.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/blacklist_recipients.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: blacklist_recipients.m4,v 8.14 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: blacklist_recipients.m4,v 8.14 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', Modified: stable/7/contrib/sendmail/cf/feature/block_bad_helo.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/block_bad_helo.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/block_bad_helo.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: block_bad_helo.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: block_bad_helo.m4,v 1.2 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_BLOCK_BAD_HELO_', `')dnl Modified: stable/7/contrib/sendmail/cf/feature/compat_check.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/compat_check.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/compat_check.m4 Mon May 26 15:31:26 2014 (r266694) @@ -9,7 +9,7 @@ divert(-1) # # divert(0) -VERSIONID(`$Id: compat_check.m4,v 1.5 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: compat_check.m4,v 1.5 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', `', `errprint(`FEATURE(`compat_check') requires FEATURE(`access_db') Modified: stable/7/contrib/sendmail/cf/feature/conncontrol.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/conncontrol.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/conncontrol.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: conncontrol.m4,v 1.5 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: conncontrol.m4,v 1.5 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', ` Modified: stable/7/contrib/sendmail/cf/feature/delay_checks.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/delay_checks.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/delay_checks.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: delay_checks.m4,v 8.9 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: delay_checks.m4,v 8.9 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_DELAY_CHECKS_', 1) Modified: stable/7/contrib/sendmail/cf/feature/dnsbl.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/dnsbl.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/dnsbl.m4 Mon May 26 15:31:26 2014 (r266694) @@ -12,7 +12,7 @@ divert(-1) ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')') divert(0) ifdef(`_DNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: dnsbl.m4,v 8.34 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: dnsbl.m4,v 8.34 2013-11-22 20:51:11 ca Exp $') define(`_DNSBL_R_',`') ifelse(defn(`_ARG_'), `', `errprint(`*** ERROR: missing argument for FEATURE(`dnsbl')')') Modified: stable/7/contrib/sendmail/cf/feature/domaintable.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/domaintable.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/domaintable.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: domaintable.m4,v 8.25 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: domaintable.m4,v 8.25 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_DOMAIN_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/enhdnsbl.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/enhdnsbl.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/enhdnsbl.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ ifelse(defn(`_ARG_'), `', `errprint(`*** ERROR: missing argument for FEATURE(`enhdnsbl')')') divert(0) ifdef(`_EDNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: enhdnsbl.m4,v 1.13 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: enhdnsbl.m4,v 1.13 2013-11-22 20:51:11 ca Exp $') LOCAL_CONFIG define(`_EDNSBL_R_',`')dnl # map for enhanced DNS based blacklist lookups Modified: stable/7/contrib/sendmail/cf/feature/generics_entire_domain.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/generics_entire_domain.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/generics_entire_domain.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: generics_entire_domain.m4,v 8.2 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: generics_entire_domain.m4,v 8.2 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_GENERICS_ENTIRE_DOMAIN_', 1) Modified: stable/7/contrib/sendmail/cf/feature/genericstable.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/genericstable.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/genericstable.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: genericstable.m4,v 8.24 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: genericstable.m4,v 8.24 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_GENERICS_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/greet_pause.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/greet_pause.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/greet_pause.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: greet_pause.m4,v 1.5 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: greet_pause.m4,v 1.5 2013-11-22 20:51:11 ca Exp $') divert(-1) ifelse(len(X`'_ARG_),`1',`ifdef(`_ACCESS_TABLE_', `', Modified: stable/7/contrib/sendmail/cf/feature/ldap_routing.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/ldap_routing.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/ldap_routing.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.21 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: ldap_routing.m4,v 8.21 2013-11-22 20:51:11 ca Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 Modified: stable/7/contrib/sendmail/cf/feature/limited_masquerade.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/limited_masquerade.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/limited_masquerade.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: limited_masquerade.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: limited_masquerade.m4,v 8.10 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_LIMITED_MASQUERADE_', 1) Modified: stable/7/contrib/sendmail/cf/feature/local_lmtp.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/local_lmtp.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/local_lmtp.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: local_lmtp.m4,v 8.18 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: local_lmtp.m4,v 8.18 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', Modified: stable/7/contrib/sendmail/cf/feature/local_no_masquerade.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/local_no_masquerade.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/local_no_masquerade.m4 Mon May 26 15:31:26 2014 (r266694) @@ -9,7 +9,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: local_no_masquerade.m4,v 1.3 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: local_no_masquerade.m4,v 1.3 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', Modified: stable/7/contrib/sendmail/cf/feature/local_procmail.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/local_procmail.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/local_procmail.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: local_procmail.m4,v 8.23 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: local_procmail.m4,v 8.23 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', Modified: stable/7/contrib/sendmail/cf/feature/lookupdotdomain.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/lookupdotdomain.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/lookupdotdomain.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: lookupdotdomain.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: lookupdotdomain.m4,v 1.2 2013-11-22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', Modified: stable/7/contrib/sendmail/cf/feature/loose_relay_check.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/loose_relay_check.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/loose_relay_check.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: loose_relay_check.m4,v 8.7 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: loose_relay_check.m4,v 8.7 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_LOOSE_RELAY_CHECK_', 1) Modified: stable/7/contrib/sendmail/cf/feature/mailertable.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/mailertable.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/mailertable.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: mailertable.m4,v 8.26 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: mailertable.m4,v 8.26 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_MAILER_TABLE_', `') Modified: stable/7/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: masquerade_entire_domain.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: masquerade_entire_domain.m4,v 8.10 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_MASQUERADE_ENTIRE_DOMAIN_', 1) Modified: stable/7/contrib/sendmail/cf/feature/masquerade_envelope.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/masquerade_envelope.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/masquerade_envelope.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: masquerade_envelope.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: masquerade_envelope.m4,v 8.10 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_MASQUERADE_ENVELOPE_', 1) Modified: stable/7/contrib/sendmail/cf/feature/msp.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/msp.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/msp.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$Id: msp.m4,v 1.34 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: msp.m4,v 1.34 2013-11-22 20:51:11 ca Exp $') divert(-1) undefine(`ALIAS_FILE') define(`confDELIVERY_MODE', `i') Modified: stable/7/contrib/sendmail/cf/feature/mtamark.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/mtamark.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/mtamark.m4 Mon May 26 15:31:26 2014 (r266694) @@ -11,7 +11,7 @@ divert(-1) divert(0) ifdef(`_MTAMARK_R',`dnl',`dnl -VERSIONID(`$Id: mtamark.m4,v 1.3 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: mtamark.m4,v 1.3 2013-11-22 20:51:11 ca Exp $') LOCAL_CONFIG define(`_MTAMARK_R',`')dnl # map for MTA mark Modified: stable/7/contrib/sendmail/cf/feature/no_default_msa.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/no_default_msa.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/no_default_msa.m4 Mon May 26 15:31:26 2014 (r266694) @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: no_default_msa.m4,v 8.3 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: no_default_msa.m4,v 8.3 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_NO_MSA_', `1') Modified: stable/7/contrib/sendmail/cf/feature/nocanonify.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/nocanonify.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/nocanonify.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: nocanonify.m4,v 8.13 2013/11/22 20:51:11 ca Exp $') +VERSIONID(`$Id: nocanonify.m4,v 8.13 2013-11-22 20:51:11 ca Exp $') divert(-1) define(`_NO_CANONIFY_', 1) Modified: stable/7/contrib/sendmail/cf/feature/notsticky.m4 ============================================================================== --- stable/7/contrib/sendmail/cf/feature/notsticky.m4 Mon May 26 15:30:27 2014 (r266693) +++ stable/7/contrib/sendmail/cf/feature/notsticky.m4 Mon May 26 15:31:26 2014 (r266694) @@ -13,7 +13,7 @@ divert(-1) # *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-7@FreeBSD.ORG Mon May 26 15:36:57 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B95CAC88; Mon, 26 May 2014 15:36:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5BF02F8C; Mon, 26 May 2014 15:36:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QFavEQ099926; Mon, 26 May 2014 15:36:57 GMT (envelope-from gshapiro@svn.freebsd.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QFavDJ099925; Mon, 26 May 2014 15:36:57 GMT (envelope-from gshapiro@svn.freebsd.org) Message-Id: <201405261536.s4QFavDJ099925@svn.freebsd.org> From: Gregory Neil Shapiro Date: Mon, 26 May 2014 15:36:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r266697 - stable/7/contrib/sendmail X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 15:36:57 -0000 Author: gshapiro Date: Mon May 26 15:36:57 2014 New Revision: 266697 URL: http://svnweb.freebsd.org/changeset/base/266697 Log: MFC: Update for sendmail 8.14.9 import Modified: stable/7/contrib/sendmail/FREEBSD-upgrade Directory Properties: stable/7/contrib/sendmail/ (props changed) Modified: stable/7/contrib/sendmail/FREEBSD-upgrade ============================================================================== --- stable/7/contrib/sendmail/FREEBSD-upgrade Mon May 26 15:36:22 2014 (r266696) +++ stable/7/contrib/sendmail/FREEBSD-upgrade Mon May 26 15:36:57 2014 (r266697) @@ -1,6 +1,6 @@ $FreeBSD$ -sendmail 8.14.8 +sendmail 8.14.9 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following directories were renamed: @@ -97,4 +97,4 @@ infrastructure in FreeBSD: usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -26-January-2014 +21-May-2014 From owner-svn-src-stable-7@FreeBSD.ORG Mon May 26 15:47:27 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA87F49B; Mon, 26 May 2014 15:47:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96D9220C0; Mon, 26 May 2014 15:47:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QFlRBD006434; Mon, 26 May 2014 15:47:27 GMT (envelope-from gshapiro@svn.freebsd.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QFlRWm006431; Mon, 26 May 2014 15:47:27 GMT (envelope-from gshapiro@svn.freebsd.org) Message-Id: <201405261547.s4QFlRWm006431@svn.freebsd.org> From: Gregory Neil Shapiro Date: Mon, 26 May 2014 15:47:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r266700 - stable/7/etc/sendmail X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 15:47:27 -0000 Author: gshapiro Date: Mon May 26 15:47:26 2014 New Revision: 266700 URL: http://svnweb.freebsd.org/changeset/base/266700 Log: MFC: Minor changes to force commit these files so new freebsd*.cf files are built to use the new sendmail-8.14.9/cf tree. Modified: stable/7/etc/sendmail/freebsd.mc stable/7/etc/sendmail/freebsd.submit.mc Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/sendmail/freebsd.mc ============================================================================== --- stable/7/etc/sendmail/freebsd.mc Mon May 26 15:46:19 2014 (r266699) +++ stable/7/etc/sendmail/freebsd.mc Mon May 26 15:47:26 2014 (r266700) @@ -33,7 +33,6 @@ divert(-1) # SUCH DAMAGE. # - # # This is a generic configuration file for FreeBSD 6.X and later systems. # If you want to customize it, copy it to a name appropriate for your Modified: stable/7/etc/sendmail/freebsd.submit.mc ============================================================================== --- stable/7/etc/sendmail/freebsd.submit.mc Mon May 26 15:46:19 2014 (r266699) +++ stable/7/etc/sendmail/freebsd.submit.mc Mon May 26 15:47:26 2014 (r266700) @@ -9,7 +9,6 @@ divert(-1) # # - # # This is the FreeBSD configuration for a set-group-ID sm-msp sendmail # that acts as a initial mail submission program. From owner-svn-src-stable-7@FreeBSD.ORG Mon May 26 16:01:46 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39FCC588; Mon, 26 May 2014 16:01:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2664C22DB; Mon, 26 May 2014 16:01:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QG1k50016854; Mon, 26 May 2014 16:01:46 GMT (envelope-from gshapiro@svn.freebsd.org) Received: (from gshapiro@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QG1kO8016852; Mon, 26 May 2014 16:01:46 GMT (envelope-from gshapiro@svn.freebsd.org) Message-Id: <201405261601.s4QG1kO8016852@svn.freebsd.org> From: Gregory Neil Shapiro Date: Mon, 26 May 2014 16:01:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r266704 - stable/7/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 16:01:46 -0000 Author: gshapiro Date: Mon May 26 16:01:45 2014 New Revision: 266704 URL: http://svnweb.freebsd.org/changeset/base/266704 Log: Note merge for sendmail 8.14.9. Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Mon May 26 16:00:35 2014 (r266703) +++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Mon May 26 16:01:45 2014 (r266704) @@ -660,8 +660,8 @@ OpenSSL has been updated to version 0.9.8q. - sendmail has - been updated to version 8.14.8. + sendmail has + been updated to version 8.14.9. The &man.tcsh.1; program has been updated to version 6.17.00. From owner-svn-src-stable-7@FreeBSD.ORG Wed Jun 4 12:24:54 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B3FC9C1; Wed, 4 Jun 2014 12:24:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 572B72BEC; Wed, 4 Jun 2014 12:24:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54COsZV073806; Wed, 4 Jun 2014 12:24:54 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54COsEY073805; Wed, 4 Jun 2014 12:24:54 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201406041224.s54COsEY073805@svn.freebsd.org> From: Alexander Motin Date: Wed, 4 Jun 2014 12:24:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r267052 - stable/7/sys/cam X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 12:24:54 -0000 Author: mav Date: Wed Jun 4 12:24:53 2014 New Revision: 267052 URL: http://svnweb.freebsd.org/changeset/base/267052 Log: MFC r237398: In camisr() clear CAM_SIM_ON_DONEQ flag after camisr_runqueue() purged SIM done queue. Clearing it before caused extra SIM queueing in some cases. It was invisible during normal operation, but during USB device unplug and respective SIM destruction it could keep pointer on SIM without having counted reference and as result crash the system by use afer free. PR: usb/168743 Modified: stable/7/sys/cam/cam_xpt.c Directory Properties: stable/7/ (props changed) stable/7/sys/ (props changed) Modified: stable/7/sys/cam/cam_xpt.c ============================================================================== --- stable/7/sys/cam/cam_xpt.c Wed Jun 4 12:05:47 2014 (r267051) +++ stable/7/sys/cam/cam_xpt.c Wed Jun 4 12:24:53 2014 (r267052) @@ -7227,8 +7227,8 @@ camisr(void *dummy) while ((sim = TAILQ_FIRST(&queue)) != NULL) { TAILQ_REMOVE(&queue, sim, links); CAM_SIM_LOCK(sim); - sim->flags &= ~CAM_SIM_ON_DONEQ; camisr_runqueue(&sim->sim_doneq); + sim->flags &= ~CAM_SIM_ON_DONEQ; CAM_SIM_UNLOCK(sim); } } From owner-svn-src-stable-7@FreeBSD.ORG Sat Jun 14 11:37:03 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B9D2E06; Sat, 14 Jun 2014 11:37:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB7A22857; Sat, 14 Jun 2014 11:37:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5EBb2Zb027392; Sat, 14 Jun 2014 11:37:02 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5EBb2ja027387; Sat, 14 Jun 2014 11:37:02 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201406141137.s5EBb2ja027387@svn.freebsd.org> From: Edwin Groothuis Date: Sat, 14 Jun 2014 11:37:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r267475 - stable/7/share/zoneinfo X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 11:37:03 -0000 Author: edwin Date: Sat Jun 14 11:37:01 2014 New Revision: 267475 URL: http://svnweb.freebsd.org/changeset/base/267475 Log: MFC of i267473,tzdata2013b Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Modified: stable/7/share/zoneinfo/africa stable/7/share/zoneinfo/australasia stable/7/share/zoneinfo/europe stable/7/share/zoneinfo/northamerica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/africa ============================================================================== --- stable/7/share/zoneinfo/africa Sat Jun 14 11:36:29 2014 (r267474) +++ stable/7/share/zoneinfo/africa Sat Jun 14 11:37:01 2014 (r267475) @@ -239,13 +239,13 @@ Rule Egypt 1990 1994 - May 1 1:00 1:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S -Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 - +Rule Egypt 1995 2005 - Sep lastThu 24:00 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006 only - Sep 21 23:00s 0 - +Rule Egypt 2006 only - Sep 21 24:00 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ Rule Egypt 2006 only - Sep 21 23:00s 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm -Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 - +Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,46 +342,77 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May "midnight" (24:00) -# From Paul Eggert (2014-05-13): +# From Imed Chihi (2014-06-04): +# We have finally "located" a precise official reference about the DST changes +# in Egypt. The Ministers Cabinet decision is explained at +# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... +# [T]his (Arabic) site is not accessible outside Egypt, but the page ... +# translates into: "With regard to daylight saving time, it is scheduled to +# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, +# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, +# and re-established again at the end of the month of Ramadan, at twelve +# o'clock on the evening of Thursday, 31 JUL 2014." This statement has been +# reproduced by other (more accessible) sites[, e.g.,]... +# http://elgornal.net/news/news.aspx?id=4699258 + +# From Paul Eggert (2014-06-04): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. The AP story says -# DST will not be observed during Ramadan. There is no information about when -# DST will end. See: +# above) says DST had no affect on electricity consumption. There is +# no information about when DST will end this fall. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later transitions will use 2010's rules, and that -# Egypt will agree with Morocco (see below) about the date Ramadan starts and -# ends, though (unlike Morocco) it will switch at 00:00 standard time. In -# Egypt the spring-forward transitions are removed for 2020-2022, when the -# guessed spring-forward date falls during the estimated Ramadan, and all -# transitions removed for 2023-2038, where the estimated Ramadan falls entirely -# outside the guessed daylight-saving time. Ramadan intrudes on the guessed -# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. - -Rule Egypt 2008 only - Aug lastThu 23:00s 0 - -Rule Egypt 2009 only - Aug 20 23:00s 0 - -Rule Egypt 2010 only - Aug 11 0:00 0 - -Rule Egypt 2010 only - Sep 10 0:00 1:00 S -Rule Egypt 2010 only - Sep lastThu 23:00s 0 - +# For now, guess that later spring and fall transitions will use +# 2010's rules, and guess that Egypt will switch to standard time at +# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the +# first Friday after Ramadan. To implement this, +# transition dates for 2015 through 2037 were determined by running +# the following program under GNU Emacs 24.3, with the results integrated +# by hand into the table below. Ramadan again intrudes on the guessed +# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff. +# (let ((islamic-year 1436)) +# (while (< islamic-year 1460) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) +# (friday 5)) +# (while (/= friday (mod a 7)) +# (setq a (1- a))) +# (while (/= friday (mod b 7)) +# (setq b (1+ b))) +# (setq a (1- a)) +# (setq b (1- b)) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n" +# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) +Rule Egypt 2008 only - Aug lastThu 24:00 0 - +Rule Egypt 2009 only - Aug 20 24:00 0 - +Rule Egypt 2010 only - Aug 10 24:00 0 - +Rule Egypt 2010 only - Sep 9 24:00 1:00 S +Rule Egypt 2010 only - Sep lastThu 24:00 0 - Rule Egypt 2014 only - May 15 24:00 1:00 S -Rule Egypt 2014 only - Jun 29 0:00s 0 - -Rule Egypt 2014 only - Jul 29 0:00s 1:00 S -Rule Egypt 2014 max - Sep lastThu 23:00s 0 - +Rule Egypt 2014 only - Jun 26 24:00 0 - +Rule Egypt 2014 only - Jul 31 24:00 1:00 S +Rule Egypt 2014 max - Sep lastThu 24:00 0 - Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S -Rule Egypt 2015 only - Jun 18 0:00s 0 - -Rule Egypt 2015 only - Jul 18 0:00s 1:00 S -Rule Egypt 2016 only - Jun 7 0:00s 0 - -Rule Egypt 2016 only - Jul 7 0:00s 1:00 S -Rule Egypt 2017 only - May 27 0:00s 0 - -Rule Egypt 2017 only - Jun 26 0:00s 1:00 S -Rule Egypt 2018 only - May 16 0:00s 0 - -Rule Egypt 2018 only - Jun 15 0:00s 1:00 S -Rule Egypt 2019 only - May 6 0:00s 0 - -Rule Egypt 2019 only - Jun 5 0:00s 1:00 S -Rule Egypt 2020 only - May 24 0:00s 1:00 S -Rule Egypt 2021 only - May 13 0:00s 1:00 S -Rule Egypt 2022 only - May 3 0:00s 1:00 S +Rule Egypt 2015 only - Jun 11 24:00 0 - +Rule Egypt 2015 only - Jul 23 24:00 1:00 S +Rule Egypt 2016 only - Jun 2 24:00 0 - +Rule Egypt 2016 only - Jul 7 24:00 1:00 S +Rule Egypt 2017 only - May 25 24:00 0 - +Rule Egypt 2017 only - Jun 29 24:00 1:00 S +Rule Egypt 2018 only - May 10 24:00 0 - +Rule Egypt 2018 only - Jun 14 24:00 1:00 S +Rule Egypt 2019 only - May 2 24:00 0 - +Rule Egypt 2019 only - Jun 6 24:00 1:00 S +Rule Egypt 2020 only - May 28 24:00 1:00 S +Rule Egypt 2021 only - May 13 24:00 1:00 S +Rule Egypt 2022 only - May 5 24:00 1:00 S Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -914,39 +945,36 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # From Sebastien Willemijns (2014-03-18): # http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp -# From Paul Eggert (2014-03-19): -# To estimate what the Moroccan government will do in future years, -# transition dates for 2014 through 2038 were determined by running -# the following program under GNU Emacs 24.3: -# -# (let ((islamic-year 1435)) -# (while (< islamic-year 1461) -# (let ((a -# (calendar-gregorian-from-absolute -# (calendar-islamic-to-absolute (list 9 1 islamic-year)))) -# (b -# (calendar-gregorian-from-absolute -# (calendar-islamic-to-absolute (list 10 1 islamic-year))))) -# (insert -# (format -# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n" -# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n") -# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) -# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# From Milamber Space Network (2014-06-05): +# The Moroccan government has recently announced that the country will return +# to standard time at 03:00 on Saturday, June 28, 2014 local time.... DST +# will resume again at 02:00 on Saturday, August 2, 2014.... +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586 + +# From Paul Eggert (2014-06-05): +# For now, guess that later spring and fall transitions will use 2014's rules, +# and guess that Morocco will switch to standard time at 03:00 the last +# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after +# Ramadan. To implement this, transition dates for 2015 through 2037 were +# determined by running the following program under GNU Emacs 24.3, with the +# results integrated by hand into the table below. +# (let ((islamic-year 1436)) +# (while (< islamic-year 1460) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n" +# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# with spring-forward transitions removed for 2023-2025, when the -# normal spring-forward date falls during the estimated Ramadan; with -# all transitions removed for 2026-2035, where the estimated Ramadan -# falls entirely outside daylight-saving time; and with fall-back -# transitions removed for 2036-2037, where the normal fall-back -# date falls during the estimated Ramadan. Normally, the table would -# stop after 2037 because 32-bit time_t values roll around early in 2038, -# but that would imply a prediction of perpetual DST after March 2038 -# due to the year-2037 glitches. So, this table instead stops after -# 2038, the first non-glitchy year after the 32-bit rollover. -# An advantage of stopping after 2038 is that it lets zic guess -# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future. # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -968,46 +996,44 @@ Rule Morocco 1978 only - Aug 4 0:00 0 Rule Morocco 2008 only - Jun 1 0:00 1:00 S Rule Morocco 2008 only - Sep 1 0:00 0 - Rule Morocco 2009 only - Jun 1 0:00 1:00 S -Rule Morocco 2009 only - Aug 21 0:00 0 - +Rule Morocco 2009 only - Aug 21 0:00 0 - Rule Morocco 2010 only - May 2 0:00 1:00 S Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S -Rule Morocco 2011 only - Jul 31 0 0 - -Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 only - Sep 30 3:00 0 - -Rule Morocco 2012 only - Jul 20 3:00 0 - -Rule Morocco 2012 only - Aug 20 2:00 1:00 S -Rule Morocco 2013 only - Jul 7 3:00 0 - -Rule Morocco 2013 only - Aug 10 2:00 1:00 S -Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - -Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S -Rule Morocco 2014 only - Jun 29 3:00 0 - -Rule Morocco 2014 only - Jul 29 2:00 1:00 S -Rule Morocco 2015 only - Jun 18 3:00 0 - -Rule Morocco 2015 only - Jul 18 2:00 1:00 S -Rule Morocco 2016 only - Jun 7 3:00 0 - -Rule Morocco 2016 only - Jul 7 2:00 1:00 S -Rule Morocco 2017 only - May 27 3:00 0 - -Rule Morocco 2017 only - Jun 26 2:00 1:00 S -Rule Morocco 2018 only - May 16 3:00 0 - -Rule Morocco 2018 only - Jun 15 2:00 1:00 S -Rule Morocco 2019 only - May 6 3:00 0 - -Rule Morocco 2019 only - Jun 5 2:00 1:00 S -Rule Morocco 2020 only - Apr 24 3:00 0 - -Rule Morocco 2020 only - May 24 2:00 1:00 S -Rule Morocco 2021 only - Apr 13 3:00 0 - -Rule Morocco 2021 only - May 13 2:00 1:00 S -Rule Morocco 2022 only - Apr 3 3:00 0 - -Rule Morocco 2022 only - May 3 2:00 1:00 S -Rule Morocco 2023 only - Apr 22 2:00 1:00 S -Rule Morocco 2024 only - Apr 10 2:00 1:00 S -Rule Morocco 2025 only - Mar 31 2:00 1:00 S -Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S -Rule Morocco 2036 only - Oct 21 3:00 0 - -Rule Morocco 2037 only - Oct 11 3:00 0 - -Rule Morocco 2038 only - Sep 30 3:00 0 - -Rule Morocco 2038 only - Oct 30 2:00 1:00 S -Rule Morocco 2038 max - Oct lastSun 3:00 0 - +Rule Morocco 2011 only - Jul 31 0 0 - +Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - +Rule Morocco 2012 only - Jul 20 3:00 0 - +Rule Morocco 2012 only - Aug 20 2:00 1:00 S +Rule Morocco 2013 only - Jul 7 3:00 0 - +Rule Morocco 2013 only - Aug 10 2:00 1:00 S +Rule Morocco 2013 max - Oct lastSun 3:00 0 - +Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S +Rule Morocco 2014 only - Jun 28 3:00 0 - +Rule Morocco 2014 only - Aug 2 2:00 1:00 S +Rule Morocco 2015 only - Jun 13 3:00 0 - +Rule Morocco 2015 only - Jul 18 2:00 1:00 S +Rule Morocco 2016 only - Jun 4 3:00 0 - +Rule Morocco 2016 only - Jul 9 2:00 1:00 S +Rule Morocco 2017 only - May 20 3:00 0 - +Rule Morocco 2017 only - Jul 1 2:00 1:00 S +Rule Morocco 2018 only - May 12 3:00 0 - +Rule Morocco 2018 only - Jun 16 2:00 1:00 S +Rule Morocco 2019 only - May 4 3:00 0 - +Rule Morocco 2019 only - Jun 8 2:00 1:00 S +Rule Morocco 2020 only - Apr 18 3:00 0 - +Rule Morocco 2020 only - May 30 2:00 1:00 S +Rule Morocco 2021 only - Apr 10 3:00 0 - +Rule Morocco 2021 only - May 15 2:00 1:00 S +Rule Morocco 2022 only - Apr 2 3:00 0 - +Rule Morocco 2022 only - May 7 2:00 1:00 S +Rule Morocco 2023 only - Apr 22 2:00 1:00 S +Rule Morocco 2024 only - Apr 13 2:00 1:00 S +Rule Morocco 2025 only - Apr 5 2:00 1:00 S +Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S +Rule Morocco 2035 only - Oct 27 3:00 0 - +Rule Morocco 2036 only - Oct 18 3:00 0 - +Rule Morocco 2037 only - Oct 10 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 Modified: stable/7/share/zoneinfo/australasia ============================================================================== --- stable/7/share/zoneinfo/australasia Sat Jun 14 11:36:29 2014 (r267474) +++ stable/7/share/zoneinfo/australasia Sat Jun 14 11:37:01 2014 (r267475) @@ -250,24 +250,14 @@ Zone Antarctica/Macquarie 0 - zzz 1899 N Zone Indian/Christmas 7:02:52 - LMT 1895 Feb 7:00 - CXT # Christmas Island Time -# Cook Is -# From Shanks & Pottenger: -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Cook 1978 only - Nov 12 0:00 0:30 HS -Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 - -Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua - -10:30 - CKT 1978 Nov 12 # Cook Is Time - -10:00 Cook CK%sT - -# Cocos +# Cocos (Keeling) Is # These islands were ruled by the Ross family from about 1830 to 1978. # We don't know when standard time was introduced; for now, we guess 1900. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Indian/Cocos 6:27:40 - LMT 1900 6:30 - CCT # Cocos Islands Time + # Fiji # Milne gives 11:55:44 for Suva. @@ -473,7 +463,8 @@ Rule NZ 1934 1940 - Apr lastSun 2:00 0 M Rule NZ 1934 1940 - Sep lastSun 2:00 0:30 S Rule NZ 1946 only - Jan 1 0:00 0 S # Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no -# convenient notation for this so we must duplicate the Rule lines. +# convenient single notation for the date and time of this transition +# so we must duplicate the Rule lines. Rule NZ 1974 only - Nov Sun>=1 2:00s 1:00 D Rule Chatham 1974 only - Nov Sun>=1 2:45s 1:00 D Rule NZ 1975 only - Feb lastSun 2:00s 0 S @@ -511,6 +502,17 @@ Link Pacific/Auckland Antarctica/McMurdo # previously whalers, sealers, pastoralists, and scientific personnel wintered # was probably like Pacific/Auckland +# Cook Is +# From Shanks & Pottenger: +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Cook 1978 only - Nov 12 0:00 0:30 HS +Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 - +Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 HS +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua + -10:30 - CKT 1978 Nov 12 # Cook Is Time + -10:00 Cook CK%sT + ############################################################################### Modified: stable/7/share/zoneinfo/europe ============================================================================== --- stable/7/share/zoneinfo/europe Sat Jun 14 11:36:29 2014 (r267474) +++ stable/7/share/zoneinfo/europe Sat Jun 14 11:37:01 2014 (r267475) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # tz@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2014-05-31): # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # San Diego: ACS Publications, Inc. (2003). @@ -17,6 +17,9 @@ # published semiannually. Law sent in several helpful summaries # of the IATA's data after 1990. # +# A reliable and entertaining source about time zones is +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). +# # Except where otherwise noted, Shanks & Pottenger is the source for # entries through 1991, and IATA SSIM is the source for entries afterwards. # @@ -26,9 +29,9 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), # which I found in the UCLA library. # -# # William Willett, The Waste of Daylight, 19th edition -# (1914-03) +# +# [PDF] (1914-03) # # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 # . He writes: @@ -58,10 +61,7 @@ # 1:00 CET CEST CEMT Central Europe # 1:00:14 SET Swedish (1879-1899)* # 2:00 EET EEST Eastern Europe -# 3:00 MSK MSD Moscow -# -# A reliable and entertaining source about time zones, especially in Britain, -# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). +# 3:00 MSK MSD MSM* Moscow # From Peter Ilieve (1994-12-04), # The original six [EU members]: Belgium, France, (West) Germany, Italy, @@ -558,11 +558,11 @@ Rule Russia 1917 only - Dec 28 0:00 0 M Rule Russia 1918 only - May 31 22:00 2:00 MDST # Moscow Double Summer Time Rule Russia 1918 only - Sep 16 1:00 1:00 MST Rule Russia 1919 only - May 31 23:00 2:00 MDST -Rule Russia 1919 only - Jul 1 2:00 1:00 S -Rule Russia 1919 only - Aug 16 0:00 0 - -Rule Russia 1921 only - Feb 14 23:00 1:00 S -Rule Russia 1921 only - Mar 20 23:00 2:00 M # Midsummer -Rule Russia 1921 only - Sep 1 0:00 1:00 S +Rule Russia 1919 only - Jul 1 2:00 1:00 MSD +Rule Russia 1919 only - Aug 16 0:00 0 MSK +Rule Russia 1921 only - Feb 14 23:00 1:00 MSD +Rule Russia 1921 only - Mar 20 23:00 2:00 MSM # Midsummer +Rule Russia 1921 only - Sep 1 0:00 1:00 MSD Rule Russia 1921 only - Oct 1 0:00 0 - # Act No.925 of the Council of Ministers of the USSR (1980-10-24): Rule Russia 1981 1984 - Apr 1 0:00 1:00 S @@ -2217,6 +2217,7 @@ Zone Europe/Kaliningrad 1:22:00 - LMT 1 Zone Europe/Moscow 2:30:20 - LMT 1880 2:30 - MMT 1916 Jul 3 # Moscow Mean Time 2:30:48 Russia %s 1919 Jul 1 2:00 + 3:00 Russia %s 1921 Oct 3:00 Russia MSK/MSD 1922 Oct 2:00 - EET 1930 Jun 21 3:00 Russia MSK/MSD 1991 Mar 31 2:00s @@ -2375,7 +2376,7 @@ Zone Asia/Yakutsk 8:38:40 - LMT 1919 De Zone Asia/Vladivostok 8:47:44 - LMT 1922 Nov 15 9:00 - VLAT 1930 Jun 21 # Vladivostok Time 10:00 Russia VLA%sT 1991 Mar 31 2:00s - 9:00 Russia VLA%sST 1992 Jan 19 2:00s + 9:00 Russia VLA%sT 1992 Jan 19 2:00s 10:00 Russia VLA%sT 2011 Mar 27 2:00s 11:00 - VLAT Modified: stable/7/share/zoneinfo/northamerica ============================================================================== --- stable/7/share/zoneinfo/northamerica Sat Jun 14 11:36:29 2014 (r267474) +++ stable/7/share/zoneinfo/northamerica Sat Jun 14 11:37:01 2014 (r267475) @@ -1019,9 +1019,9 @@ Zone America/Menominee -5:50:27 - LMT 18 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), # which I found in the UCLA library. # -# # William Willett, The Waste of Daylight, 19th edition -# (1914-03) +# +# [PDF] (1914-03) # # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 # .