From owner-svn-src-stable-12@freebsd.org Sun Mar 22 01:22:45 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0F29272178; Sun, 22 Mar 2020 01:22:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lKWT4xr9z4C7p; Sun, 22 Mar 2020 01:22:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9046E1DA2B; Sun, 22 Mar 2020 01:22:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02M1MjPA067674; Sun, 22 Mar 2020 01:22:45 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02M1MjAl067670; Sun, 22 Mar 2020 01:22:45 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <202003220122.02M1MjAl067670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 22 Mar 2020 01:22:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359199 - stable/12/usr.bin/calendar/calendars X-SVN-Group: stable-12 X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: stable/12/usr.bin/calendar/calendars X-SVN-Commit-Revision: 359199 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 01:22:46 -0000 Author: pfg Date: Sun Mar 22 01:22:44 2020 New Revision: 359199 URL: https://svnweb.freebsd.org/changeset/base/359199 Log: MFC r353909, r355192, r355218, r355218, r358506, r359005: calendar(1): Updates and corrections for some calendar files. PR: 242909, 242918 Modified: stable/12/usr.bin/calendar/calendars/calendar.birthday stable/12/usr.bin/calendar/calendars/calendar.history stable/12/usr.bin/calendar/calendars/calendar.holiday stable/12/usr.bin/calendar/calendars/calendar.music Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/12/usr.bin/calendar/calendars/calendar.birthday Sun Mar 22 01:01:47 2020 (r359198) +++ stable/12/usr.bin/calendar/calendars/calendar.birthday Sun Mar 22 01:22:44 2020 (r359199) @@ -5,7 +5,7 @@ */ #ifndef _calendar_birthday_ -#define _calendar_birthday_ +#define _calendar_birthday_ #undef unix 01/01 J.D. Salinger born, 1919 @@ -15,22 +15,26 @@ 01/04 Jakob Grimm born, 1785 01/04 Wilhelm Beer born, 1797, first astronomer to map Mars 01/05 DeWitt B. Brace born, 1859, inventor of spectrophotometer +01/06 Millard Fillmore's birthday (let's party!) +01/07 Nikola Tesla died in the Hotel New Yorker room 3327, 1943 01/10 Ethan Allen born, 1738 01/11 Alexander Hamilton born in Nevis, British West Indies, 1757? 01/12 "Long" John Baldry is born in London, 1941 -01/13 Horatio Alger born, 1834 +01/13 Horatio Alger born, 1832 01/13 Sophie Tucker born, 1884 01/13 Wilhelm Wien born, 1864, Nobel prize for blackbody radiation laws 01/14 Albert Schweitzer born, 1875 -01/15 Martin Luther King, Jr. born +01/15 Martin Luther King, Jr. born, 1929 01/17 Benjamin Franklin born in Boston, 1706 01/19 Edgar Allan Poe born in Boston, 1809 01/19 Robert Edward Lee born in Stratford Estate, Virginia, 1807 -01/20 George Burns born, 1898 +01/20 George Burns born, 1896 +01/20 Dr. Mendeleev died with a pen in his hand, 1907 01/21 Lenin died, 1924 01/21 Thomas Jonathan "Stonewall" Jackson born in Clarksburg, VA, 1824 01/22 Sir Francis Bacon born, 1561 01/23 Ernst Abbe born, 1840, formulated diffraction theory +01/23 Grigori Yefimovich Rasputin born, 1869 01/23 Humphrey Bogart born in New York City, 1899 01/23 John Hancock born, 1737 01/23 Joseph Hewes born, 1730 @@ -48,26 +52,28 @@ 02/06 King George VI of UK dies; his daughter becomes Elizabeth II, 1952 02/07 Sinclair Lewis born, 1885 02/08 Friedleib F. Runge born, 1795, father of paper chromatography +02/08 John von Neumann died, 1957 02/08 Jules Verne born in Nantes, France, 1828 02/09 George Hartmann born, 1489, designed astrolabes, timepieces, etc. 02/10 Charles Lamb born, 1775 02/10 William Allen White born, 1868 -02/11 Thos. Edison born, 1847 +02/11 Thomas Edison born, 1847 02/11 William Henry Fox Talbot (photographic pioneer) born, 1800 02/12 Abraham Lincoln born, 1809 02/12 Charles Darwin born in Shrewsbury, England, 1809 02/15 Galileo Galilei born in Pisa, Italy, 1564 02/15 Susan B. Anthony born, 1820 02/16 Pierre Bouguer born, 1698, founder of photometry -02/17 Federick Eugene Ives born, 1856, pioneer of halftone +02/17 Frederic Eugene Ives born, 1856, pioneer of halftone 02/17 Marion Anderson born, 1902 02/17 T. J. Watson, Sr. born, 1874 02/18 Ernst Mach born, 1838, philosopher & optics pioneer +02/18 Michelangelo Buonarroti dies in Rome, Italy, 1564 02/19 Nicolas Copernicus born in Thorn, Poland, 1473 -02/20 Ludwig Boltzmann born, 1838, atomic physics pioneer +02/20 Ludwig Boltzmann born, 1844, atomic physics pioneer 02/21 Alexis De Rochon born, 1838, developed the spyglass 02/22 George Washington born, 1732 -02/22 Pierre Jules Cesar Janssen born, 1838, found hydrogen in the sun +02/22 Pierre Jules Cesar Janssen born, 1824, found hydrogen in the sun 02/23 W.E.B. DuBois born, 1868 02/24 Winslow Homer born, 1836 02/24 Steve Jobs born, 1955 @@ -81,30 +87,41 @@ 03/02 Dr. Seuss born, 1904 03/04 Casimir Pulaski born, 1747 03/05 John Belushi dies in Los Angeles, 1982 +03/05 Joseph Stalin died in Moscow, 1953 +03/06 Michelangelo Buonarroti born in Caprese, Italy, 1475 +03/07 Aristotle died, 322BC 03/07 Sir John Frederick William Herschel born, 1792, astronomer 03/08 Alvan Clark born, 1804, astronomer & lens manufacturer 03/08 Howard Aiken born, 1900 03/11 Robert Treat Paine born, 1737 03/11 Vannevar Bush born, 1890 +03/11 Douglas Adams born in Cambridge, England, 1952 03/12 Gustav Robert Kirchhoff born, 1824, physicist +03/12 Terry Pratchett (Sir) dies, 2015, author 03/14 Albert Einstein born, 1879 03/14 Casey Jones born, 1864 03/14 Giovanni Virginia Schiaparelli born, 1835, astronomer; named Mars "canals" 03/14 Jean Baptiste Joseph Fourier born, 1768, mathematician & physicist +03/14 Karl Marx died, 1883 03/15 Andrew "Old Hickory" Jackson, 7th President of the United States, born in Waxhaw, South Carolina, 1767 03/15 J.J. Robert's Birthday in Liberia 03/16 George Clymer born, 1739 03/16 James Madison, 4th President of the United States, born in King George County, Virginia, 1751 +03/19 Arthur C. Clarke died in Colombo, Sri Lanka, 2008 03/21 NetBSD project born, 1993 +03/23 Pierre Simon de Laplace born, 1749, mathematician & astronomer 03/24 Harry Houdini born, 1874 03/26 Benjamin Thompson born, 1753, Count Rumford; physicist 03/26 David Packard died, 1996; age of 83 +03/27 Maurits Cornelis Escher died, 1972 +03/27 Stanislaw Lem died, 2006 03/27 Wilhelm Conrad Roentgen born, 1845, discoverer of X-rays 03/28 Pierre Simon de Laplace born, 1749, mathematician & astronomer 03/30 Francisco Jose de Goya born, 1746 +03/30 Queen Elizabeth, the Queen Mother, died at the age of 101, 2002 03/30 Sean O'Casey born, 1880 03/30 Vincent Van Gogh born, 1853 03/31 Rene Descartes born, 1596, mathematician & philosopher @@ -123,11 +140,17 @@ 04/14 Christiaan Huygens born, 1629, physicist & astronomer; discovered Saturn's rings 04/15 Leonardo da Vinci born, 1452 +04/15 Leonhard Euler born in Basel, 1707 04/16 Charles (Charlie) Chaplin (Sir) born in London, 1889 +04/20 Adolf Hitler born, 1889 04/22 Kant born, 1724 +04/22 Lenin born, the best friend of all the children, 1870 +04/23 William Shakespeare died, 1616 +04/26 William Shakespeare baptised, 1564 04/27 Louis Victor de Broglie born, 1774, physicist 04/28 James Monroe, 5th President of the United States, born in Westmoreland County, Viriginia, 1758 +04/28 Terry Pratchett (Sir) born, 1948, author 04/29 Jules Henri Poincare born, 1854, founder of topology 04/29 William Randolph Hearst born in San Francisco, 1863 04/30 Karl Friedrich Gauss born, 1777, mathematician & astronomer @@ -136,6 +159,7 @@ 05/02 Dr. Benjamin Spock born, 1903 05/04 Alice Liddell born, 1852, Alice's Adventures in Wonderland & Through the Looking-Glass +05/05 Karl Marx born, 1818 05/09 Pinza died, 1957 05/10 Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899 05/11 Johnny Appleseed born, 1768 @@ -153,7 +177,7 @@ 05/29 Patrick Henry born, 1736 05/30 Mel (Melvin Jerome) Blanc born in San Francisco, 1908 06/01 Brigham Young born, 1801 -06/01 Marilyn Monroe born, 1928 +06/01 Marilyn Monroe born, 1926 06/02 Edward Elgar (Sir) born in Worcester, England, 1857 06/03 Henry James born, 1811 06/07 (Eugene Henri) Paul Gaugin born, 1848 @@ -167,7 +191,7 @@ 06/19 FreeBSD project born, 1993 06/22 Carl Hubbell born, 1903 06/22 Meryl Streep born in Summit, New Jersey, 1949 -06/22 Konrad Zuse born in Berlin, 1919 +06/22 Konrad Zuse born in Berlin, 1910 06/23 Alan Mathison Turing born, 1912 06/25 Eric Arthur Blair (a.k.a. George Orwell) born, 1903 06/27 Helen Keller born, 1880 @@ -179,24 +203,30 @@ 07/07 P.T. Barnum dies, 1891 07/08 Count Ferdinand von Zeppelin born, 1838 07/10 John Calvin born, 1509 +07/10 Nikola Tesla born, 1856 07/11 John Quincy Adams, 6th President of the United States, born in Braintree, Massachusetts, 1767 07/12 Henry David Thoreau born, 1817 07/15 Clement Clarke Moore born, 1779, author of "A Visit from Saint Nicholas" 07/18 Brian Auger is born in London, 1939 +07/20 Alexander the Great born, 356 BC +07/20 Bruce Lee died in Hong Kong, 1973 +07/25 Robert Morris is born in Boston, 1932 07/25 Steve Goodman is born in Chicago, 1948 07/29 Mussolini born, 1883 07/30 Emily Bronte born, 1818 07/30 Henry Ford born, 1863 08/01 Herman Melville born, 1819 08/03 Lenny Bruce dies of a morphine overdose, 1966 +08/05 Friedrich Engels died, 1895 +08/06 Edsger Wybe Dijkstra died after a long struggle with cancer, 2002 08/06 Jonathan B. Postel is born in Altadena, California, 1943 08/08 Dustin Hoffman born in Los Angeles, 1937 08/12 Thomas Mann's Death, 1955 08/13 Alfred Hitchcock born, 1899 08/13 Annie Oakley born, 1860 -08/13 Fidel Castro born, 1927 +08/13 Fidel Castro born, 1926 08/17 Mae West born, 1892 08/18 Meriwether Lewis born, 1774 08/20 Leon Trotsky assassinated, 1940 @@ -207,6 +237,7 @@ 08/27 Lyndon B. Johnson born, 1908 08/29 Oliver Wendell Holmes born, 1809, physician & father of the jurist 08/30 John W. Mauchly born, 1907 +09/02 J.R.R. Tolkien died, 1973 09/05 King Louis XIV of France born, 1638 09/05 Raquel Welch born, 1942 09/06 Word is received that Perry has reached the North Pole and died, 1909 @@ -217,11 +248,17 @@ 09/09 Chinese Communist Party Chairman Mao Tse-Tung dies at age 82, 1976 09/09 Dennis MacAlistair Ritchie, creator of C, born, 1941 09/12 Jesse Owens born, 1913 +09/12 Stanislaw Lem born in Lwow, Poland, 1921 09/13 Walter Reed born, 1851 09/15 Agatha Christie born in Torquay, England, 1890 09/16 Allen Funt born in Brooklyn, NY, 1914 +09/17 Ken Kesey born in La Junta, CO, 1935 +09/18 Konstantin Eduardovich Tsiolkovsky born, 1857, father of rocket flight 09/18 Greta Garbo born, 1905 09/18 Jimi Hendrix dies from an overdose, 1970 +09/18 Leonhard Euler died in St. Petersburg, 1783 +09/19 President Garfield dies of wounds in Elberon, N.J., 1881 +09/19 Konstantin Eduardovich Tsiolkovsky died, Russian SFSR, 1935 09/20 Upton (Beall) Sinclair born, 1878 09/21 H.G. (Herbert George) Wells born in Bromley, England, 1866 09/21 Louis Joliet born, 1645 @@ -264,12 +301,14 @@ Massachusetts 1735. 10/31 Chiang Kai-Shek born, 1887 10/31 Dale Evans born, 1912 +11/01 Joseph Stalin's burial, 1961 11/02 Daniel Boone born near Reading, PA, 1734 11/04 King William III of Orange born, 1650 11/05 Roy Rogers born, 1912 11/09 Carl Sagan born, 1934 11/10 Martin Luther born in Eisleben, Germany, 1483 11/10 Soviet President Leonid Brezhnev dies at age 75, 1982 +11/11 Fyodor Mikhailovich Dostoevsky born in Moscow, Russia, 1821 11/11 Kurt Vonnegut, Jr, born in Indianapolis, 1922 11/13 Robert Louis Stevenson born, 1850 11/13 St. Augustine of Hippo born in Numidia, Algeria, 354 @@ -278,9 +317,12 @@ 11/20 Robert Francis Kennedy (RFK) born in Boston, Massachusetts, 1925 11/26 Charles Schulz born in Minneapolis, 1922 11/26 Norbert Wiener born in Columbia, Missouri, 1894 +11/27 Bruce Lee born in San Francisco, 1940 +11/28 Friedrich Engels born, 1820 +11/28 Joe Ossanna died, 1977 11/29 John Mayall is born in Cheshire, England, 1933 11/30 Cleopatra died, 30 BC -11/30 Mark Twain (Samuel Clemmens) born in Florida, Missouri, 1835 +11/30 Mark Twain (Samuel Clemens) born in Florida, Missouri, 1835 12/01 Woody Allen (Allen Stuart Konigsberg) born in Brooklyn, NY, 1935 12/04 Tommy Bolin dies of a heroin overdose in Miami, 1976 12/05 Martin Van Buren, 8th President of the United States, born in @@ -288,17 +330,21 @@ 12/05 Walt (Walter Elias) Disney born in Chicago, 1901 12/08 Horace (Quintus Horatius Flaccus) born in Venosa (Italy), 65BC 12/08 James (Grover) Thurber born in Columbus, Ohio, 1894 -12/10 Emily Dickenson born, 1830 +12/10 Emily Dickinson born, 1830 12/12 E.G. Robinson born, 1893 12/14 George Washington dies, 1799 +12/16 Arthur C. Clarke born in Somerset, England, 1917 12/17 William Safire (Safir) born, 1929 12/18 Konrad Zuse died in Hünfeld, 1995 12/20 Carl Sagan died, 1996 12/21 Benjamin Disraeli born, 1804 12/22 Giacomo Puccini born, 1858 +12/22 Joseph Vissarionnovich Djugashvili (Stalin) born, 1879 +12/22 Samuel Beckett dies in Paris, 1989 12/23 Joseph Smith born, 1805 12/25 Isaac Newton (Sir) born in Grantham, England, 1642 12/26 Chas. Babbage born, 1791 12/28 John von Neumann born, 1903 +12/29 Grigori Yefimovich Rasputin assasinated, 1916 #endif /* !_calendar_birthday_ */ Modified: stable/12/usr.bin/calendar/calendars/calendar.history ============================================================================== --- stable/12/usr.bin/calendar/calendars/calendar.history Sun Mar 22 01:01:47 2020 (r359198) +++ stable/12/usr.bin/calendar/calendars/calendar.history Sun Mar 22 01:22:44 2020 (r359199) @@ -5,18 +5,27 @@ */ #ifndef _calendar_history_ -#define _calendar_history_ +#define _calendar_history_ 01/01 Anniversary of the Triumph of the Revolution in Cuba 01/01 Castro expels Cuban President Batista, 1959 01/01 Churchill delivers his "Iron Curtain" speech, 1947 01/01 First Rose Bowl; Michigan 49 - Stanford 0, 1902 +01/02 Canada and the United States agree on a plan to preserve + Niagara Falls, 1929 +01/03 Benito Mussolini announces he is taking dictatorial powers + over Italy, 1925 +01/03 Margaret Thatcher becomes the longest-serving British + Prime Minister in the 20th Century, 1988 +01/04 Burma becomes independent from United Kingdom, 1948 01/04 Quadrantid meteor shower (look north) 01/05 -50 degrees F, Strawberry UT, 1913 01/05 The FCC hears the first demonstration of FM radio, 1940 01/05 Twelfth night -01/06 Millard Fillmore's birthday (let's party!) +01/06 Maria Montessori opens her first school in Rome, 1907 +01/07 First transatlantic telephone call, 1927 01/08 Battle of New Orleans +01/08 Monaco gains its independence, 1297 01/09 Plough Monday 01/10 First meeting of United Nations General Assembly in London, 1946 01/10 Thomas Paine's Common Sense published, 1776 @@ -26,12 +35,28 @@ 01/11 Prithvi Jayanti in Nepal 01/11 Surgeon General condemned cigarettes, 1964 01/11 The Whiskey-A-Go-Go opens on Sunset Boulevard in Los Angeles, 1963 +01/12 Batman the TV series debuts on ABC, 1966 +01/13 Mickey Mouse comic strip makes its first appearance, 1930 01/14 The first "Be-In" is held in Golden Gate Park, 1967 +01/15 Angola becomes an independent state, 1975 01/16 Prohibition begins, 1920 +01/16 The Medici family are made official bankers of the Papacy, 1412 +01/17 Captain James Cook becomes the first explorer to cross the + Antarctic Circle, 1773 01/18 Grey whale migration, California +01/18 The X-ray machine is exhibited for the first time, 1896 +01/19 The last Volkswagen Beetle made in Germany leaves VW's plant, 1978 01/20 St. Agnes Eve (Ah, bitter chill it was...) +01/21 First commercial flight with a Concorde, 1976 +01/22 British colonists reach New Zealand, 1840 +01/23 The Royal Exchange opens in London, 1571 +01/23 The Union of Utrecht forms a Protestant republic in + the Netherlands, 1579 01/24 Eskimo Pie patented by Christian Nelson, 1922 01/24 Gold discovered in California at Sutter's Mill, 1848 +01/24 Robert Baden-Powell begins the Boy Scout movement, 1908 +01/25 The British Parliament passes the Constitutional Act of 1791 and splits + the old province of Quebec into Upper and Lower Canada, 1791 01/26 Sydney, New South Wales settled, 1788 01/27 Grissom, White and Chaffe burned to death in Apollo 1, 1967 01/27 Vietnam War cease-fire signed, 1973 @@ -39,111 +64,207 @@ 01/28 Space Shuttle Challenger (51-L) explodes 74 seconds after liftoff killing Scobee, Smith, McNair, Resnick, Jarvis, Onizuka and McAuliffe, 1986 +01/28 The first locomotive runs from the Atlantic to the Pacific on the + Panama Railway, 1855 +01/29 Liliuokalani is proclaimed Queen of Hawaii, the last monarch of + Hawaii, 1891 01/30 Mohandas Gandhi assassinated in New Delhi by Hindu fanatic, 1948 01/30 Tet Offensive, 1968 01/31 "Ham" the chimpanzee soars into space aboard Mercury-Redstone 2, 1961 +01/31 Dmitry Mendeleev established optimal alcohol-water mixture ratio + in his PhD work on alcohol-water mixtures, 1865 01/31 Explorer I launched, 1958. Van Allen Belt discovered -01/31 Irving Langmuir, 1881, invented tungsten filament lamp +01/31 Irving Langmuir invented tungsten filament lamp, 1881 02/01 First TV soap: Secret Storm, 1954 02/01 Forces led by Khomeini take over Iran, 1979 02/01 Space Shuttle Columbia (STS-107) disintegrates 15 minutes before landing killing Husband, McCool, Chawla, Clark, Ramon, Brown, and Anderson, 2003 +02/02 Adolf Hitler dissolves the German Parliament, 1933 +02/03 The first commercial cheese factory is founded in Switzerland, 1815 02/04 Cybernet inaugurated, 1969 02/04 Patricia Hearst kidnapped by Symbionese Liberation Army, 1974 +02/05 Gamel Abdel Nasser is nominated to be the first president of + the United Arab Republic, 1958 +02/06 Signing of the Treaty of Waitangi, founding document of New Zealand, 1840 +02/07 The British Labour Party is formed, 1900 02/08 1963 Revolution Anniversary in Iraq 02/09 -51 degrees F, Vanderbilt MI, 1934 -02/12 US President Abraham Lincoln's real birthday +02/09 Gregory XV becomes Pope, the last Pope elected by acclamation, 1621 +02/10 New Delhi becomes the capital of India, 1931 +02/11 Norway's independence is proclaimed, marking the ultimate end of + the Kalmar Union, 1814 +02/12 China adopts the Gregorian calendar, 1912 02/12 Santa Barbara oil leak, 1969 +02/13 France tests its first atomic bomb in Algeria, 1960 02/14 Bombing of Dresden, 1945 02/15 Chicago Seven convicted, 1970 02/16 Nylon patented, 1937 02/16 Stephen Decatur burns US frigate in Tripoli, 1804 +02/17 The first ship passes through the Suez Canal, 1867 +02/18 Joseph Goebbels delivers the Sportpalast speech, 1943 02/18 Pluto discovered by Clyde Tombaugh, Lowell Observatory, AZ, 1930 +02/19 Serfdom is abolished in Russia, 1861 02/19 US Marines land on Iwo Jima, 1945 +02/20 FBI agent Robert Hanssen is arrested and charged with spying for Russia + for 15 years, 2001 02/20 John Glenn orbits the Earth 3 times, 1962 02/21 Battle of Verdun begins, 1916 1M casualties 02/21 First telephone directory, New Haven, Connecticut, 1878 02/21 Malcom X shot to death in Harlem, 1965 +02/22 Start of the Czechoslovak Revolution, 1948 02/23 Lt. Calley confesses, implicates Cpt. Medina, 1971 02/24 Impeachment proceedings against Andrew Johnson begin, 1868 +02/25 The Democratic Republic of Georgia occupied by Bolshevist Russia, 1921 +02/26 Final radio broadcast of Dragnet, 1957 +02/27 The Lionheart crowned, 1189 02/28 The "French Connection" drug bust occurs in Marseilles, 1972 02/29 French and Indian raid on Deerfield MA, 1704 03/01 Sarah Goode, Sarah Osborne, and Tituba arrested for witchcraft in Salem, Massachusetts, 1692 -03/02 Blackthorn winds (New England) (Does anyone know what this is?) -03/04 First meeting of Congress, 1789, in N.Y.C. +03/01 The city of Rio de Janeiro is founded, 1565 +03/02 Blackthorn winds (New England) +03/02 Ho Chi Minh is elected the President of North Vietnam, 1946 +03/03 Bulgaria regains its independence from Ottoman Empire, 1878 +03/04 Emile Berliner invents the microphone, 1877 +03/04 First meeting of Congress in N.Y.C., 1789 +03/05 Samuel Colt makes the first production-model revolver, 1836 +03/06 The aspirin is registered as a trademark of Bayer, 1899 +03/07 Mass protest outside the National Assembly of Kuwait building for + women's voting rights in Kuwait, 2005 +03/08 The first case of Spanish flu occurs, killing 50 million to 100 million + people worldwide, 1918 +03/09 The Barbie doll debuts, 1959 +03/10 Republic of Cote d'Ivoire becomes a colony of France, 1893 +03/11 Ceasefire declared in the war between Iran and Irak, 1988 +03/12 The first bottles of Coca Cola were sold, 1894 03/13 "Striptease" introduced, Paris, 1894 03/14 Teddy Roosevelt excludes Japanese laborers from continental US, 1907 -03/15 Day of the 1848 revolution in Hungary +03/14 The kingdom of Cyprus is sold by the ruling Queen to Venice, 1489 03/15 Buzzards return to Hinckley OH +03/15 Day of the 1848 revolution in Hungary 03/15 France assumes protectorate over Vietnam, 1874 03/15 Watts, Los Angeles, riots kill two, injure 25, 1966 03/15 Ides of March. Gaius Julius Caesar assassinated by senators, including adoptive son Marcus Junius Brutus Caepio, 44BC +03/15 Julius Caesar, Dictator of the Roman Republic, is stabbed to death by + several senators, 44BC +03/15 Watts, Los Angeles, riots kill two, injure 25, 1966 +03/16 Largest coordinated worldwide vigil against the Iraq War, 2003 03/16 MyLai Massacre; 300 non-combatant villagers killed by US infantrymen 03/16 Robert Goddard launches first liquid-fueled rocket, Auburn MA, 1926 +03/17 Invention of the rubber band, 1845 +03/17 Ukrainian Nationalist Republic declared, 1917 03/17 Vanguard I launched, 1958. Earth proved pear-shaped 03/18 Aleksei Leonov performs first spacewalk, 1965 +03/18 In the Pyramid of Cheops a 4.400 year old mummy is found, 1989 03/19 Swallows return to Capistrano 03/20 Radio Caroline, the original British pirate radio station, sinks, 1980 +03/21 Henry V becomes the king of England, 1413 +03/22 First motion picture displayed by Auguste and Louis Lumière, 1895 +03/22 World Day for Water +03/23 The first Islamic republic in the world is Pakistan, 1956 03/24 Construction of New York subway system begins, 1900 +03/25 The first Bed-In for Peace by John Lennon and Yoko Ono, 1969 03/25 Triangle Shirt Waist Fire, 1911 03/26 Popeye statue unveiled, Crystal City TX Spinach Festival, 1937 +03/26 The driving test is introduced, in the United Kingdom, 1934 03/27 Khrushchev becomes Premier of Soviet Union, 1958 03/28 Three Mile Island releases radioactive gas, 1979 03/29 Swedish settled Christiana (Wilmington) DE, 1638 +03/29 The Republic of Ireland bans smoking in all work places, 2004 03/30 Alaska purchased from Russia for $7.2 million, 1867 03/30 Five rings around Uranus discovered, 1977 03/30 Pencil with eraser patented, 1858 +03/31 The Eiffel Tower is inaugurated, 1889 04/01 People of superb intelligence, savoir-faire, etc. born this day. +04/02 Haile Selassie is proclaimed emperor of Ethiopia, 1930 +04/03 First publication of the newspaper La Gazzetta dello Sport, 1896 04/04 Martin Luther King assassinated in Memphis, Tennessee, 1968 -04/04 NATO Established, 1949 +04/04 NATO established, 1949 +04/05 Pocahontas marries English colonist John Rolfe in Virginia, 1614 04/06 Joseph Smith founds Mormon Church, 1830 04/07 Alewives run, Cape Cod 04/08 Matthew Flinders and Nicolas Baudin meet in Encounter Bay, 1802 +04/08 The Venus de Milo is found on the island of Melos, 1820 04/09 Lee surrenders to Grant at Appomattox Courthouse, 1865 +04/09 The first public exhibition of art opens in Paris, 1667 +04/10 The Belfast Agreement is signed, on Good Friday, 1998 +04/11 The Shogunate is abolished in Japan, 1868 04/12 Confederate troops fire first shots of Civil War at Ft Sumter, 1861 +04/12 Great Britain adopts the Union Jack as their national flag, 1606 04/12 Space Shuttle Columbia launched, 1981 04/12 Yuri Gagarin becomes the first man in space, 1961 04/13 Laotian New Year (3 days) in Laos 04/14 US President Abraham Lincoln shot in Ford's Theatre by John Wilkes Booth, 1865 04/14 Titanic hits iceberg and sinks, 1912 +04/15 Insulin first becomes generally available for use by diabetics, 1923 04/15 US President Abraham Lincoln dies, 1865 04/15 Ray Kroc opens first McDonalds in Des Plaines, IL, 1955 +04/16 Syria becomes an independent Republic, 1946 04/17 Bay of Pigs invasion crushed by Castro forces, 1961 04/18 Einstein's Death, 1955 04/18 First Laundromat opens, Fort Worth Texas, 1934 04/18 San Francisco earthquake, 1906 +04/18 The League of Nations is dissolved after 27 years, 1946 04/19 Landing of the "33" in Uruguay 04/19 Warsaw Ghetto uprising, 1943 +04/20 In Bulgaria, the April Uprising takes place, 1876 04/20 Supreme Court unanimously rules in favor of busing, 1971 04/21 Lyrid meteor shower +04/21 Rome is founded by Romulus and Remus, 753BC +04/22 Portuguese navigator Pedro Alvares Cabral becomes the first European to + sight Brazil, 1500 +04/22 The first Earth Day is celebrated, 1970 04/22 Vladimir Ilich Ulyanov, called Lenin, Russian political leader, born in Simbirsk, 1870 +04/23 Bavarian co-rulers Duke Wilhelm IV and Duke Ludwig X proclaimed the + weighty and consequential Bavarian Beer Purity Law + (later Reinheitsgebot), 1516 04/23 Hank Aaron hits his first home run, 1954 +04/24 The Greek enter Troy with the Trojan Horse, 1184BC +04/25 Integrated circuit patented by Robert Noyce, 1961 04/26 William Shakespeare baptized in Stratford-on-Avon, England, 1564, - birthdate unknown + birthdate less certain 04/27 Magellan killed in Philippines, 1521 +04/28 President of France, Charles de Gaulle resigns, 1969 04/29 Zipper patented by Gideon Sindback, 1913 +04/30 Adolf Hitler and Eva Braun commit suicide, 1945 05/01 Beltaine; Feast of the god Bel, sun god +05/01 Adam Weishaupt founded the Illuminati of Bavaria, 1776 +05/02 The first modern sighting of the Loch Ness monster is reported, 1933 05/03 Anti-war protest disrupts business in Washington, 1971 +05/03 Jamaica is spotted by Christopher Columbus, 1494 +05/04 Christopher Columbus sets foot on Jamaica, 1494 05/04 Four Kent State students are shot down by the National Guard, 1970 05/05 John Scopes arrested for teaching evolution, Dayton, TN, 1925 +05/05 Kublai Khan becomes ruler of the Mongol Empire, 1260 05/06 Hindenburg explodes and burns upon landing at Lakehurst, NJ, 1937 -05/07 Germany surrenders after WWII, 1945 +05/07 Germany surrenders after World War II, 1945 05/08 Beginning of ostrich mating season +05/08 Herbert Akroyd Stuart patented the first "diesel" engine, 1890 05/08 US institutes mining of Haiphong Harbor, 1972 05/09 94 degrees, New York, 1979 +05/09 The first parliament of Australia opens in Melbourne, 1901 05/10 Germany invades Low Countries, 1940 05/10 Nazi bookburning, 1933 +05/11 Thailand is no longer known as Siam, 1949 +05/12 Tunisia becomes a French protectorate, 1881 +05/13 Dutch statesman Johan van Oldenbarnevelt is executed in The Hague after + having been accused of treason, 1619 05/14 Beginning of Lewis and Clark Expedition, 1804 05/14 Nation of Israel proclaimed, 1948 05/15 Asylum for Inebriates founded, Binghamton NY, 1854 +05/15 The civil war in Finland ends, 1918 +05/16 Root beer invented by Charles Elmer Hires, 1866 05/17 24" rain in 11 hours, Pearl River, S. China, 1982 05/17 Six SLA members killed in televised gun fight, 1974 05/18 Battle of Las Piedras in Uruguay 05/18 Napoleon crowned Emperor, 1804 +05/19 The Legion d'Honneur is founded by Napoleon Bonaparte, 1802 +05/20 The first modern atlas issued by Abraham Ortelius, 1570 05/21 Battle of Iquique in Chile 05/21 US explodes first hydrogen bomb, 1956 +05/22 The transporting of British convicts to the New South Wales colony, + is abolished, 1840 05/22 US Civil War ends, 1865 05/23 Israeli raid into Argentina to capture Adolf Eichmann, 1960 05/23 Two Yetis sighted, Mt. Everest, 1953 @@ -152,19 +273,35 @@ 05/25 Oral Roberts sees 900 foot tall Jesus Christ, Tulsa OK, 1980 05/25 Successful test of the limelight in Purfleet, England, 1830 05/26 Congress sets first immigration quotas, 1924 +05/26 John Calvin and his followers are expelled from Geneva, 1538 05/27 Golden Gate Bridge opens, 1937 +05/27 The pop-up toaster patented by Charles Strite, 1919 +05/28 Alan Turing submits On Computable Numbers for publication, 1936 05/29 Edmund Hillary and Tenzing Norkay climb Mt. Everest, 1953 05/29 First food stamps issued, 1961 05/30 US Marines sent to Nicaragua, 1912 +05/30 Beginning of the civil war over Biafra, 1967 +05/31 Yom Kippur War comes to an end by the signing of a disengagement + agreement by Syria and Israel, 1974 +06/01 In a referendum the Dutch reject the European Constitution, 2005 +06/02 Denmark rejects the Maastricht Treaty in a close-call referendum, 1992 06/02 Native Americans "granted" citizenship, 1924 +06/03 Edward White becomes the first American to perform a "Space Walk", 1965 +06/03 Last Star Trek episode first aired ("Turnabout Intruder"), 1969 06/04 Roquefort cheese developed, 1070 06/05 Robert Kennedy assassinated, 1968 +06/05 Titus and his Roman legions breach the middle wall of Jerusalem, 70 06/05 US leaves the Gold Standard, 1933 06/06 First drive-in movie, 1933 06/06 Normandy landing, 1944 +06/07 The first act of civil disobedience by Gandhi, 1893 +06/08 The Canadian Parliament meets for the first time in Ottawa, 1866 +06/09 The Roman Emperor Nero commits suicide, 68 06/10 Death of Alexander the Great, 323 B.C. 06/10 Denver police tear gas Jethro Tull and 2000 fans at Red Rocks, 1971 06/11 Greeks seize Troy, 1184BC +06/12 Nelson Mandela is sentenced to life in prison, 1964 +06/13 Much of Vancouver, British Columbia, is devastated by a fire, 1886 06/13 Pioneer flies past Neptune, and therefore out of the Solar System 06/14 Sandpaper invented by I. Fischer, Jr., 1834 06/15 Ben Franklin's kite experiment, 1752 @@ -173,16 +310,21 @@ that all the hooves of a horse are off the ground during the gallop, 1878 06/16 "The Blues Brothers" premieres in Chicago, 1980 +06/16 Henry Ford launched the Ford Motor Company, 1903 06/17 China explodes its first Hydrogen bomb, 1967 06/17 Watergate Democratic National Committee break-in, 1972 +06/18 Winston Churchill delivers his "Finest Hour" speech, 1940 06/19 Julius and Ethel Rosenberg are executed in Sing-Sing prison, 1953 06/19 Lizzie Bordon acquitted, 1893 06/20 Victoria crowned, 1837 06/21 Berlin airlift begins, 1948 06/21 Sun rises over Heelstone at Stonehenge 06/22 Civil rights workers disappear in Mississippi, 1964 +06/22 The June Days Uprising in Paris begins, 1848 +06/23 Harriet, Darwin's turtle died at the age of 176 years, 2006 06/23 Slavery abolished in England, 1772 06/24 Senate repeals Gulf of Tonkin resolution, 1970 +06/24 The capital of Jamaica, Kingston, is founded, 1664 06/25 Custer's Last Stand at Little Big Horn, 1876 06/25 North Korea invades South Korea, 1950 06/26 Battle of Gettysburg, 1863 @@ -190,47 +332,83 @@ 06/26 Toothbrush invented, 1498 06/27 100 degrees, Fort Yukon, 1915 06/27 Bill Graham closes the Fillmore East, 1971 +06/27 The world's first ATM is installed in Enfield, London, 1967 +06/28 Archduke Franz Ferdinand of Austria assassinated in Sarajevo, + marking the beginning of World War I, 1914 06/28 Supreme Court decides in favor of Allan Bakke, 1978 -06/30 "That" explosion in Siberia, 1908 +06/28 World War I ended with the signing of the Treaty of Versailles, 1919 +06/29 The Seychelles gains independence from the United Kingdom, 1976 +06/30 "That" explosion in Siberia at 7:17 local time, 1908 +06/30 Albert Einstein published his theory of special relativity, 1905 06/30 China and Soviet Union announce split over ideology, 1960 07/01 Battle of Gettysburg begins, 1863 +07/01 Hong Kong becomes a special administrative region of the People's + Republic of China, 1997 +07/01 The first day on the Somme marked the beginning of the + Battle of the Somme, 1916 +07/01 Warsaw Pact officially dissolved, 1991 +07/02 Vermont abolishes slavery, as the first state, 1777 07/03 Dog days begin 07/04 Battles of Vicksburg and Gettysburg won by Union forces, 1863 07/04 Cloudy, 76 degrees, Philadelphia PA, 1776 07/04 New York abstains on Declaration of Independence vote, 1776 07/04 Thoreau enters woods, 1845 +07/05 Bikini demonstrated for the first time, 1946 07/06 First `talkie' (talking motion picture) premiere in New York, 1928 07/06 Lawrence of Arabia captures Aqaba, 1917 07/07 First radio broadcast of "Dragnet", 1949 07/07 Terrorists detonate four bombs on London public transport, 2005 +07/08 A UFO is believed to have crashed near Roswell, New Mexico, 1947 07/08 First public reading of the Declaration of Independence, 1776 07/08 Liberty Bell cracks while being rung at funeral of John Marshall, 1835 07/09 10-hour working day set by law, NH, 1847 +07/09 The African Union gets established, 2002 07/10 134 degrees in Death Valley, 1913 +07/10 Most of London gets burned down in a severe fire, 1212 +07/11 Mongolia gains independence from China, 1921 07/12 Minimum wages established: 40 cents/hour, 1933 07/13 Women first compete in Olympic games, 1908 +07/14 Storming of the Bastille by the citizens of Paris, 1789 +07/15 First item sold via Amazon.com, 1995 07/16 Detonation of the first atomic bomb at Alamagordo, NM, 1945 +07/16 End of the civil war in Rwanda, 1994 07/17 Disneyland opens, 1955 +07/18 "Mein Kampf" is published, 1925 07/18 Ty Cobb gets 4000th base hit, 1927 07/19 Five Massachusetts women executed for witchcraft, 1692 +07/19 France declares war on Prussia, marking the beginning of the + Franco-Prussian war, 1870 07/20 Armstrong and Aldrin land on moon, 1969 +07/20 Ford Motor Company ships their car, 1903 07/21 First Train Robbery, Jesse James gets $3000 near Adair, Iowa, 1873 07/21 Vietnam divided at 17th parallel, 1954 +07/22 Wiley Post becomes the first person to fly around the world, 1933 07/23 Ice cream cone introduced, St. Louis MO, 1904 07/24 Scopes Monkey Trial, 1925 +07/25 First test-tube baby born, 1978 +07/26 Potsdam Declaration signed, 1945 +07/27 The last Citroen 2CV made, 1990 +07/28 Potato introduced in Europe by Sir Thomas Harriot, 1586 +07/29 Inauguration of the Arc de Triomphe in Paris, 1836 07/30 "In God We Trust" made US motto, 1956 +07/30 Elvis Presley performs for the first time in public, 1954 +07/31 First U.S. patent issued, 1790 07/31 Harry S. Truman dedicates N.Y. Int'l Airport @ Idlewild Field, 1948, later JFK 08/01 Lughnasa; Feast of the god Lugh, a 30 day Celtic feast centers on this day +08/02 Hitler becomes the Fuehrer of Germany, 1934 08/03 Columbus sets sail for Cathay, 1492 08/03 USS Nautilus crosses under north polar ice cap, 1958 08/04 Axe murder of Andrew and Abbey Borden, 1892 08/04 Bombing of N. Vietnam begins, 1964 08/04 Britain declares war on Germany starting World War I, 1914 +08/05 Nelson Mandela is jailed, 1962 08/06 Atomic bomb dropped on Hiroshima, 1945 08/06 Caricom in Barbados 08/06 Cy Young pitches first game, 1890 +08/07 Jack the Ripper makes his first kill, 1888 +08/08 Atomic bomb dropped on Nagasaki, 1945 08/08 Montenegro declares war on Germany, 1914 08/08 Richard Nixon resigns the US presidency, 1974 08/08 The Great Train Robbery -- $7,368,000, 1963 @@ -240,23 +418,32 @@ 08/09 Atomic bomb dropped on Nagasaki, 1945 08/09 Singapore secedes from Malaysia, 1965 08/10 Chicago incorporated as a village of 300 people, 1833 +08/10 Major terrorist plot to destroy aircraft disrupted by + Scotland Yard, 2006 08/10 US and Panama agree to transfer the canal in the year 2000, 1977 08/11 Dog days end 08/11 France Ends War in Indochina, 1954 08/11 Perseid meteor shower (look north; three days) +08/12 Cleopatra commits suicide, 30BC 08/12 First test flight of Space Shuttle "Enterprise" from 747, 1977 08/12 Last US ground troops out of Vietnam, 1972 08/13 Berlin wall erected, 1961 08/13 Li'l Abner debut, 1934 +08/14 France introduces motor vehicle registration, 1893 08/14 Social Security begins in US, 1935 08/15 Gandhi's movement obtains independence for Pakistan and India, 1947 08/15 Hurricane hits Plymouth Plantation, 1635 08/16 Roller Coaster patented, 1898 08/17 First public bath opened in N.Y., 1891 +08/17 Indonesian Declaration of Independence, 1945 08/18 Anti-Cigarette League of America formed +08/18 Power blackout on Java, Indonesia, affects almost + 100 million people, 2005 08/19 Air Force cargo plane snares payload from Discoverer 14 spy satellite, marking start of practical military reconnaissance from space, 1960 08/19 Gail Borden patents condensed milk, 1856 +08/20 First commercial radio station airs in Detroit, Michigan, 1920 +08/21 Louvre employee steals the "Mona Lisa", 1911 08/22 Death of King Richard III, 1485, Last of the Plantagenets 08/22 Joe Walker sets X-15 all time altitude mark (67 miles), 1963 08/22 St. Columbia reports seeing monster in Loch Ness, 565 @@ -264,11 +451,14 @@ 08/24 "Alice's Restaurant" premieres in New York and Los Angeles, 1969 08/24 -126.9 F at Vostok, Antarctica, 1960 08/24 British troops burn Washington, 1814 -08/25 Gen. De Gaulle leads French forces into Paris, 1944 +08/25 General de Gaulle leads French forces into Paris, 1944 08/26 19th amendment of US constitution gives women the vote, 1920 +08/26 Women get the vote, 1920 08/27 "Tarzan of the Apes" published, 1912 08/27 Krakatoa, Java explodes with a force of 1,300 megatons, 1883 +08/28 Henry Hudson discovers Delaware Bay, 1609 08/28 Martin Luther King leads over 200,000 in civil rights rally in Washington, DC, 1963 +08/29 Michael Faraday discovers electromagnetic induction, 1831 08/29 Star in Cygnus goes nova and becomes 4th brightest in sky, 1975; Nova Cygni 1975. 08/30 75 cents a pound tariff set on opium, 1842 @@ -279,26 +469,32 @@ 08/31 Mary Anne Nichols becomes Jack the Ripper's first victim, 1888 08/31 Non-aggression pact signed by USSR and Afghanistan, 1926 08/31 Federation of Malaya gains independence from Great Britain, 1957 +08/31 Independent union "Solidarnosc" born, Gdansk, 1980 09/01 Bobby Fischer defeats Boris Spassky in World Chess Match, 1972 09/01 Joshua A. Norton proclaims himself 'Emperor Norton I', 1859 09/02 Great Britain adopts Gregorian Calendar, 1752 09/02 Japan signs unconditional surrender on US battleship `Missouri', 1945 09/03 Richard ``the Lionheart'' crowned king of England, 1189 09/03 Anniversary of the Founding of the Republic in San Marino +09/04 Napoleon III is deposed and the Third Republic is declared, 1870 09/05 US President Kennedy orders resumption of underground nuclear tests, 1961 +09/05 St. Gotthard Tunnel opens in Switzerland, 1980 09/05 The first Continental Congress was convened in Philadelphia, 1774 09/06 149 Pilgrims set forth from England aboard the Mayflower, 1620 09/06 First Star Trek episode (The Man Trap) aired 1966 09/06 US President McKinley shot, 1901 09/06 Somhlolo in Swaziland +09/07 Brazil declares its independence from Portugal, 1822 09/08 "Star Trek" debuts on NBC (1966) 09/08 Jack the Ripper kills again, Annie Chapman is second victim, 1888 09/08 US President Ford pardons Richard M. Nixon, 1974 09/09 California becomes the 31st state of the USA, 1850 +09/09 John Herschel takes the first glass plate photograph, 1839 09/09 United Colonies is renamed the United States, 1776 09/10 Mountain Meadows Massacre. Mormons kill Gentile wagon train, 1857 09/11 CIA-sponsored terrorists overthrow Chilean government, murder President Allende, 1973 09/11 Terrorists destroy World Trade Center in New York, 2001 +09/11 World Wide Fund (WWF) founded, 1961 09/12 German paratroopers rescue Mussolini from captivity in Rome, 1943 09/12 Germany annexes Sudetenland, 1938 09/13 58 °C (136.4 °F) measured at el Azizia, Libya, 1922 @@ -310,24 +506,33 @@ 09/14 The US Selective Service Act establishes the first peacetime draft, 1940 09/15 Soviet Premier Nikita Khrushchev begins his 13 day tour of the US, 1959 09/15 The US Foreign Affairs Dept. becomes the US State Department, 1789 +09/15 The Nazis adopt a new national flag with the swastika, 1935 +09/16 General Motors is founded, 1908 09/16 The village of Shawmut, Massachusetts, becomes the city of Boston, 1630 09/16 Malaya, Sabah, Sarawak and Singapore unite to become Malaysia, 1963 09/17 Battle of Antietam, 1862 +09/17 Joshua A. Norton proclaims himself 'Emperor Norton I', 1859 09/18 Victory of Uprona in Burundi 09/19 New Zealand women get the right to vote, 1893 +09/19 Walt Disney releases Steamboat Willie, 1928 09/20 Equal Rights Party nominates Belva Lockwood for US President, 1884 09/20 First meeting of the American Association for the Advancement of Science, 1848 09/20 First meeting of the US National Research Council, 1916 09/20 Magellan leaves Spain on the first Round the World passage, 1519 09/20 The Roxy Theater opens in Hollywood, 1973 +09/21 J. R. R. Tolkien's The Hobbit is published, 1937 +09/22 Allied forces form the independent nation West Germany, 1953 09/22 US President Lincoln issues the Emancipation Proclamation, 1862 09/22 Special prosecutor Leon Jeworski subpoenas US President Nixon, 1974 09/22 The first Soviet atomic bomb explodes, 1949 09/23 Philippine President Ferdinand Marcos declares martial law, 1972 09/23 The New York Knickerbockers becomes the first US Baseball club, 1845 09/23 US Vice President Nixon denies campaign fund fraud with his "Checkers" speech, 1952 +09/24 The Netherlands surrenders New Amsterdam to England, 1664 +09/25 Battle of Stamford Bridge marks the end of the Viking era, 1066 09/25 Sandra Day O'Connor becomes first woman on US Supreme Court, 1981 +09/26 Concorde makes its first non-stop crossing of the Atlantic, 1973 09/27 The first passenger was hauled in a locomotive in England, 1825 09/28 "Pilgrim's Progress" published, 1678 09/28 A Greek soldier runs 26+ miles after the Persian defeat at Marathon, @@ -336,10 +541,14 @@ 1888 09/30 The first tooth is extracted under anesthesia in Charleston, Mass, 1846 09/30 The verdicts of the Nuremberg trials are announced, 1946 +10/01 Austria issues the world's first postcards, 1869 10/01 NASA officially begins operations, 1958 +10/02 Jacques Cartier discovers Montreal, Quebec, 1535 10/02 Thurgood Marshall sworn as the first black Supreme Court Justice, 1967 +10/03 O. J. Simpson is found not guilty of murder, 1995 10/04 Crimean war begins, 1853 10/04 First space vehicle, Sputnik I, launched, 1957 +10/05 Portugal declares itself a republic, 1910 10/06 Antioch College is the first public school to admit men and women, 1853 10/06 Egyptian President Anwar es-Sadat is assassinated in Cairo, 1981 10/06 Israel is attacked by the alliance of Egypt and Syria, 1973 @@ -349,6 +558,7 @@ 10/07 Mother Teresa of Calcutta awarded the Nobel Peace Prize, 1979 10/07 Police stop Wilbur Mills car, Fanne Fox jumps into water, 1974 10/08 Great Chicago Fire, 1871 +10/08 San Marino adopts its written constitution, 1600 10/09 First two-way telephone conversation, 1876 10/10 Beginning of the Wars for Independence in Cuba 10/10 Foundation of the Workers Party in North Korea @@ -360,6 +570,8 @@ 10/11 The second Vatican Ecumenical Council opens in Rome, 1962 10/11 First broadcast of Saturday Night Live, 1975 10/12 Bahama Natives discover Columbus of Europe lost on their shores, 1492 +10/12 Bavarian Crown Prince Ludwig married Princess Therese of + Saxony-Hildburghausen, Oktoberfest, 1810 10/12 Khrushchev pounds his desk with shoe during a speech to the UN, 1960 10/12 Man O'War's last race, 1920 10/12 Native Americans discover Columbus of Europe lost on their shores, 1492 @@ -367,29 +579,42 @@ 10/13 US Navy born, 1775, authorized by the Second Continental Congress 10/14 Battle of Hastings won by William the Conqueror and the Normans, 1066 10/14 Chuck Yeager breaks sound barrier, 1947 +10/15 Edison Electric Light Company begins operation, 1878 10/15 First draft card burned, 1965 +10/16 The Walt Disney Company is founded by Walt Disney + and his brother, Roy Disney, 1923 +10/17 Al Capone convicted of income tax evasion, 1931 10/18 Boston Shoemakers form first US labor org., 1648 10/18 Soviets announce their probe took photos of the Moon's far side, 1959 +10/18 The Grand Ole Opry opens its doors, 1925 10/19 Mao Tse-tung establishes the People's Republic of China, 1949 10/19 Napoleon's beaten army begins the long retreat from Moscow, 1812 10/20 "Saturday Night Massacre", 1973 10/20 OPEC embargo, 1973 10/21 Edison makes the first practical incandescent lamp, 1879 10/21 Guggenheim Museum opens, 1959 +10/22 Laos gains independence from France, 1953 10/23 Battle of Leyte Gulf begins, 1944 10/23 Day of the 1956 revolution in Hungary 10/23 Earth created at 6:30 AM, 4004BC. +10/23 South African troops invade Angola in support of UNITA and FNLA, 1975 10/23 Swallows leave Capistrano +10/24 Founding of the United Nations, 1945 10/25 The UN removes Taiwan and admits the People's Republic of China, 1971 10/26 UN's World Health Organization declares smallpox eradicated, 1978 10/27 New York's Boss Tweed is arrested on fraud charges, 1871 10/27 The first New York Subway is opened, 1904 +10/27 Stock markets around the world crash because of fears of + a global economic meltdown, 1997 10/28 Columbus discovers Cuba, 1492 10/28 Constantine's army defeats forces of Maxentius at Mulvian Bridge, 312 10/28 Harvard was founded in Massachusetts, 1636 10/28 Statue of Liberty was dedicated on Bedloe's Island, 1886 +10/29 Leibniz makes the first use of the "long s" for integral, 1675 10/29 Stock Market Crash, 1929 +10/30 Communist Party of Australia founded in Sydney, 1920 10/30 Orson Welles' "War of the Worlds" broadcast, 1938 +10/31 First hydrogen bomb blasts Enewetak, 1952 10/31 Luther nails 95 Theses to door of Castle Church, Wittenberg, 1517 11/01 Austria-Hungary become two separate nations, 1918 11/01 Puerto Rican nationalists try to kill Truman at the Blair House, 1950 @@ -401,8 +626,11 @@ 11/04 Iranian militants seize US embassy personnel in Teheran, 1979 11/04 Soviet forces crush the anti-communist revolt in Hungary, 1956 11/05 Guy Fawkes' Plot, 1605 +11/06 Anniversary of the October Socialist Revolution (2 days) in U.S.S.R. 11/07 Abolitionist newspaperman Elijah P. Lovejoy murdered by mob, 1837 11/07 Lewis and Clark Expedition in sight of the Pacific Ocean, 1805 +11/08 Invasion of Sweden by Danish forces results in the + Stockholm Bloodbath, 1520 11/09 Blackout of New York, New England, and Eastern Canada, 1965 11/09 Giant panda discovered (?!), China, 1927 11/09 Jack the Ripper kills fifth and final victim, Jane Kelly, 1888 @@ -411,65 +639,104 @@ 11/10 41 Women arrested in suffragette demonstrations near White House, 1917 11/10 Cpt. Wirz, commandant of Andersonville Prison hanged, 1865 11/10 Henry Stanley asks David Livingstone, "Dr. Livingstone, I presume?", 1871 +11/11 First broadcast of Sesame Street, 1970 11/11 Washington becomes the 42nd state, 1889 11/12 Dr. Sun Yat-sen's Birthday in Taiwan 11/12 USA first exports oil to Europe, 1861 +11/13 St. Brice's Day massacre by order of Ethelred, king of England, 1002 +11/14 Czechoslovakia becomes a republic, 1918 11/14 Quarter Pounder price raised from $0.53 to $0.55 in violation of Nixon price controls (but okayed by Price Commission after formal request from McDonald's), 1971 +11/15 First assembly of the League of Nations is held in Geneva, 1920 11/15 Niagara Falls power plant startup, 1896 11/16 Opening of the Suez Canal, 1869 11/16 Albert Hofmann synthesizes LSD in Switzerland, 1938 11/17 46,000 meteoroids fall over AZ in 20 minutes, 1966 +11/17 Elizabeth I of England succeeds Queen Mary I of England, 1558 11/17 Richard Nixon says "I am not a crook.", 1973 11/18 First hydrogen bomb blasts Enewetok, 1952 11/18 Local standard time zones established for US, 1883 11/19 Gettysburg Address delivered, 1863 +11/19 Samuel Goldwyn and Edgar Selwyn establish Goldwyn Company, 1916 +11/20 Nuremberg Trials against 24 Nazi war criminals begin, 1945 11/21 Announcement of 18 1/2 minute gap on Watergate tape, 1973 +11/21 Birmingham Pub Bombings by the IRA kill 21 people, 1974 +11/22 John F. Kennedy is assassinated in Dallas, Texas, 1963 11/22 Kennedy shot in Dallas, Texas by Lee Harvey Oswald, 1963 11/23 First broadcast of Dr. Who (longest running TV series), 1963 +11/23 The first edition of Life is published. 1936 +11/24 Alleged assassin Lee Harvey Oswald is killed by + Jack Ruby in Dallas, Texas, 1963 11/24 Lee Harvey Oswald killed by Jack Ruby, 1963 11/25 Alfred Nobel invents dynamite, 1867 +11/26 Last flight ever with a Concorde made over Bristol, UK, 2003 11/27 Alfred Nobel establishes Nobel Prize, 1895 -11/27 Friction match invented, England, 1826 +11/27 Friction match invented by englishman John Walker, Sweden, 1826 11/27 Hoosac Railroad Tunnel completed, 1873, in NW Massachusetts +11/28 Albania declares its independence from the Ottoman Empire, 1912 11/29 King Tut's tomb opened, 1922 12/01 First national corn-husking championship, Alleman IA, 1924 +12/01 Ford Motor Company introduces the first moving assembly line, 1913 12/01 Martin Luther King Jr., leads black boycott of Montgomery buses, 1955 12/01 Rosa Parks refuses to move to back of the bus (Montgomery, AL), 1953 +12/02 Napoleon III becomes Emperor of the French, 1852 12/03 First neon light display, Paris, 1910 12/03 First successful human heart transplant led by Dr. Barnard, 1967 12/03 The Montreux Casino burns down during a Frank Zappa concert, 1971 +12/04 People's Republic of China adopts its current constitution, 1982 12/04 Washington takes leave of his officers at Fraunce's Tavern, NYC, 1783 12/05 End of Prohibition, 1933 (at least the alcohol part) 12/05 Phi Beta Kappa founded, 1776 12/05 The Eighteenth Amendment repealed, ending Prohibition, 1933 +12/06 London becomes the world's first city with motorised cabs, 1897 12/07 Japan bombs Pearl Harbor, 1941 12/08 Japan enters Second World War with invasion of Pantai Sabak, Kelantan, 1941 +12/08 Romanian Constitution is adopted in a referendum, 1991 12/09 Ball-bearing roller skates patented, 1884 12/10 Metric system established in France, 1799 12/10 Nobel Peace Prize awarded each year +12/11 The British Parliament enacts the Statute of Westminster, 1931 12/12 First wireless message sent across Atlantic by Marconi, 1901 12/13 Apollo 17 leaves the moon, with "last" men to walk on moon aboard, 1972 12/13 Dartmouth College chartered, 1769 12/13 Geminid meteor shower (look south) +12/14 Portugal joins the United Nations, 1955 12/15 Argo Merchant oil spill, 1976 12/15 Bill of Rights adopted, 1791 12/15 James Naismith invents basketball, Canada, 1891 12/15 Sitting Bull shot in head while submitting to arrest, 1890 +12/16 Pokemon episode (Electric Soldier Porygon) triggers attacks of + photosensitive epilepsy in hundreds of Japanese children, 1997 +12/17 Charles Dickens' A Christmas Carol is first published, 1843 +12/18 Indonesia invades Netherlands New Guinea, 1961 +12/19 Hitler becomes Supreme Commander-in-Chief of the + German Army, 1941 +12/20 Cheka founded, 1917 12/20 US buys ~1,000,000 sq. miles of Louisiana for ~$20/sq.mi. +12/21 Charles de Gaulle is elected President of France, 1958 12/21 Phileas Fogg completes his trip around the world in less than 80 days 12/21 Women gain the right to vote in South Australia, 1894 12/21 Women gain the right to hold political office in South Australia, 1894 +12/22 First freight train is operated in Roorkee in India, 1851 +12/23 The transistor is first demonstrated at Bell Laboratories, 1947 +12/24 Hong Kong falls to the Japanese Imperial Army, 1941 12/24 KKK formed in Pulaski, Tenn, 1865 +12/25 Christmas Island founded and named by Captain William Mynors, 1643 12/26 DPMA founded, 1951 12/27 APT report published, 1956 12/27 Ether first used as anesthetic in childbirth, 1845 12/28 Comet Kohoutek at perihelion, 1973 12/28 Proclamation of the Province of South Australia, 1836 +12/28 Spain recognizes independence of Mexico, 1836 12/29 Battle of Wounded knee, 1890 +12/29 Edison receives patent for Radio, 1891 12/30 First Los Angeles freeway dedicated, 1940 +12/30 Israel and the Vatican establish diplomatic relations, 1993 +12/30 Soviet Ukrainian Republic declared, 1917 12/31 St. Sylvester in Switzerland +12/31 First supersonic commercial flight by Tu-144, 1968 +12/31 Windows tax in England, 1695 12/31 Winterland closes its doors, 1978 #endif /* !_calendar_history_ */ Modified: stable/12/usr.bin/calendar/calendars/calendar.holiday ============================================================================== --- stable/12/usr.bin/calendar/calendars/calendar.holiday Sun Mar 22 01:01:47 2020 (r359198) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-12@freebsd.org Sun Mar 22 15:01:13 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1FA7264177; Sun, 22 Mar 2020 15:01:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lggs5h3Bz4ZST; Sun, 22 Mar 2020 15:01:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC7D92727D; Sun, 22 Mar 2020 15:01:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MF1DY9054534; Sun, 22 Mar 2020 15:01:13 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MF1DL7054532; Sun, 22 Mar 2020 15:01:13 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202003221501.02MF1DL7054532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 22 Mar 2020 15:01:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359211 - stable/12/tests/sys/fs/fusefs X-SVN-Group: stable-12 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/12/tests/sys/fs/fusefs X-SVN-Commit-Revision: 359211 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 15:01:14 -0000 Author: asomers Date: Sun Mar 22 15:01:13 2020 New Revision: 359211 URL: https://svnweb.freebsd.org/changeset/base/359211 Log: MFC r357835: fusefs: fix some memory leaks in the tests. Oddly, most of these were not detected by Coverity. Reported by: Coverity (one of them, anyway) Coverity CID: 1404490 Modified: stable/12/tests/sys/fs/fusefs/read.cc stable/12/tests/sys/fs/fusefs/write.cc Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/fs/fusefs/read.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/read.cc Sun Mar 22 12:57:49 2020 (r359210) +++ stable/12/tests/sys/fs/fusefs/read.cc Sun Mar 22 15:01:13 2020 (r359211) @@ -778,6 +778,7 @@ TEST_F(Read, cache_block) ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno); ASSERT_EQ(0, memcmp(buf, contents1, bufsize)); leak(fd); + free(contents); } /* Reading with sendfile should work (though it obviously won't be 0-copy) */ @@ -899,6 +900,8 @@ TEST_P(ReadAhead, readahead) { ASSERT_EQ(0, memcmp(rbuf, contents, bufsize)); leak(fd); + free(rbuf); + free(contents); } INSTANTIATE_TEST_CASE_P(RA, ReadAhead, Modified: stable/12/tests/sys/fs/fusefs/write.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/write.cc Sun Mar 22 12:57:49 2020 (r359210) +++ stable/12/tests/sys/fs/fusefs/write.cc Sun Mar 22 15:01:13 2020 (r359211) @@ -300,6 +300,8 @@ TEST_F(Write, append_to_cached) /* Write the new data. There should be no more read operations */ ASSERT_EQ(BUFSIZE, write(fd, CONTENTS, BUFSIZE)) << strerror(errno); leak(fd); + free(oldbuf); + free(oldcontents); } TEST_F(Write, append_direct_io) @@ -782,6 +784,8 @@ TEST_F(WriteCluster, clustering) << strerror(errno); } close(fd); + free(wbuf2x); + free(wbuf); } /* @@ -825,6 +829,7 @@ TEST_F(WriteCluster, DISABLED_cluster_write_err) << strerror(errno); } close(fd); + free(wbuf); } /* From owner-svn-src-stable-12@freebsd.org Sun Mar 22 15:03:10 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD81026440F; Sun, 22 Mar 2020 15:03:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lgk658CDz4bPt; Sun, 22 Mar 2020 15:03:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABBC9273FE; Sun, 22 Mar 2020 15:03:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MF3ARD059328; Sun, 22 Mar 2020 15:03:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MF3ArL059326; Sun, 22 Mar 2020 15:03:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202003221503.02MF3ArL059326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 22 Mar 2020 15:03:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359212 - stable/12/tests/sys/fs/fusefs X-SVN-Group: stable-12 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/12/tests/sys/fs/fusefs X-SVN-Commit-Revision: 359212 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 15:03:10 -0000 Author: asomers Date: Sun Mar 22 15:03:09 2020 New Revision: 359212 URL: https://svnweb.freebsd.org/changeset/base/359212 Log: MFC r358089, r358797 r358089: [skip ci] delete obsolete comment in fusefs tests It should've been deleted by r349436 r358797: [skip ci] fix typo in comment in the fusefs tests Modified: stable/12/tests/sys/fs/fusefs/io.cc stable/12/tests/sys/fs/fusefs/notify.cc Directory Properties: stable/12/ (props changed) Modified: stable/12/tests/sys/fs/fusefs/io.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/io.cc Sun Mar 22 15:01:13 2020 (r359211) +++ stable/12/tests/sys/fs/fusefs/io.cc Sun Mar 22 15:03:09 2020 (r359212) @@ -46,9 +46,6 @@ extern "C" { /* * For testing I/O like fsx does, but deterministically and without a real * underlying file system - * - * TODO: after fusefs gains the options to select cache mode for each mount - * point, run each of these tests for all cache modes. */ using namespace testing; Modified: stable/12/tests/sys/fs/fusefs/notify.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/notify.cc Sun Mar 22 15:01:13 2020 (r359211) +++ stable/12/tests/sys/fs/fusefs/notify.cc Sun Mar 22 15:03:09 2020 (r359212) @@ -375,7 +375,7 @@ TEST_F(Notify, inval_inode_with_clean_cache) pthread_join(th0, &thr0_value); EXPECT_EQ(0, (intptr_t)thr0_value); - /* cache attributes were been purged; this will trigger a new GETATTR */ + /* cache attributes were purged; this will trigger a new GETATTR */ ASSERT_EQ(0, stat(FULLPATH, &sb)) << strerror(errno); EXPECT_EQ(uid, sb.st_uid); EXPECT_EQ(size1, sb.st_size); From owner-svn-src-stable-12@freebsd.org Sun Mar 22 15:17:00 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53D8E2648F1; Sun, 22 Mar 2020 15:17:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lh241chTz3PYp; Sun, 22 Mar 2020 15:17:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22E56275CF; Sun, 22 Mar 2020 15:17:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MFGxgr065576; Sun, 22 Mar 2020 15:16:59 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MFGxLw065574; Sun, 22 Mar 2020 15:16:59 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202003221516.02MFGxLw065574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 22 Mar 2020 15:16:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359213 - in stable/12: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Group: stable-12 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/12: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Commit-Revision: 359213 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 15:17:00 -0000 Author: asomers Date: Sun Mar 22 15:16:59 2020 New Revision: 359213 URL: https://svnweb.freebsd.org/changeset/base/359213 Log: MFC r358798: fusefs: fix fsync for files with multiple open handles We were reusing a structure for multiple operations, but failing to reinitialize one member. The result is that a server that cares about FUSE file handle IDs would see one correct FUSE_FSYNC operation, and one with the FHID unset. PR: 244431 Reported by: Agata Modified: stable/12/sys/fs/fuse/fuse_internal.c stable/12/tests/sys/fs/fusefs/fsync.cc Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/fs/fuse/fuse_internal.c ============================================================================== --- stable/12/sys/fs/fuse/fuse_internal.c Sun Mar 22 15:03:09 2020 (r359212) +++ stable/12/sys/fs/fuse/fuse_internal.c Sun Mar 22 15:16:59 2020 (r359213) @@ -345,6 +345,7 @@ fuse_internal_fsync(struct vnode *vp, * which file handle the caller is really referring to. */ LIST_FOREACH(fufh, &fvdat->handles, next) { + fdi.iosize = sizeof(*ffsi); if (ffsi == NULL) fdisp_make_vp(&fdi, op, vp, td, NULL); else Modified: stable/12/tests/sys/fs/fusefs/fsync.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/fsync.cc Sun Mar 22 15:03:09 2020 (r359212) +++ stable/12/tests/sys/fs/fusefs/fsync.cc Sun Mar 22 15:16:59 2020 (r359213) @@ -52,7 +52,7 @@ using namespace testing; class Fsync: public FuseTest { public: -void expect_fsync(uint64_t ino, uint32_t flags, int error) +void expect_fsync(uint64_t ino, uint32_t flags, int error, int times = 1) { EXPECT_CALL(*m_mock, process( ResultOf([=](auto in) { @@ -67,12 +67,13 @@ void expect_fsync(uint64_t ino, uint32_t flags, int er in.body.fsync.fsync_flags == flags); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnErrno(error))); + ).Times(times) + .WillRepeatedly(Invoke(ReturnErrno(error))); } -void expect_lookup(const char *relpath, uint64_t ino) +void expect_lookup(const char *relpath, uint64_t ino, int times = 1) { - FuseTest::expect_lookup(relpath, ino, S_IFREG | 0644, 0, 1); + FuseTest::expect_lookup(relpath, ino, S_IFREG | 0644, 0, times); } void expect_write(uint64_t ino, uint64_t size, const void *contents) @@ -257,4 +258,30 @@ TEST_F(Fsync, fsync) ASSERT_EQ(0, fsync(fd)) << strerror(errno); leak(fd); +} + +/* If multiple FUSE file handles are active, we must fsync them all */ +TEST_F(Fsync, two_handles) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + const char *CONTENTS = "abcdefgh"; + ssize_t bufsize = strlen(CONTENTS); + uint64_t ino = 42; + int fd1, fd2; + + expect_lookup(RELPATH, ino, 2); + expect_open(ino, 0, 2); + expect_write(ino, bufsize, CONTENTS); + expect_fsync(ino, 0, 0, 2); + + fd1 = open(FULLPATH, O_WRONLY); + ASSERT_LE(0, fd1) << strerror(errno); + fd2 = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd2) << strerror(errno); + ASSERT_EQ(bufsize, write(fd1, CONTENTS, bufsize)) << strerror(errno); + ASSERT_EQ(0, fsync(fd1)) << strerror(errno); + + leak(fd1); + leak(fd2); } From owner-svn-src-stable-12@freebsd.org Sun Mar 22 15:24:28 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 34BCF264C27; Sun, 22 Mar 2020 15:24:28 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lhBh0Rx6z475r; Sun, 22 Mar 2020 15:24:27 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D61C9277C1; Sun, 22 Mar 2020 15:24:27 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MFORTm071300; Sun, 22 Mar 2020 15:24:27 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MFOP2R071290; Sun, 22 Mar 2020 15:24:25 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202003221524.02MFOP2R071290@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 22 Mar 2020 15:24:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359214 - in stable/12: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Group: stable-12 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in stable/12: sys/fs/fuse tests/sys/fs/fusefs X-SVN-Commit-Revision: 359214 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 15:24:28 -0000 Author: asomers Date: Sun Mar 22 15:24:25 2020 New Revision: 359214 URL: https://svnweb.freebsd.org/changeset/base/359214 Log: MFC r358867: fusefs: avoid cache corruption with buggy fuse servers The FUSE protocol allows the client (kernel) to cache a file's size, if the server (userspace daemon) allows it. A well-behaved daemon obviously should not change a file's size while a client has it cached. But a buggy daemon might. If the kernel ever detects that that has happened, then it should invalidate the entire cache for that file. Previously, we would not only cache stale data, but in the case of a file extension while we had the size cached, we accidentally extended the cache with zeros. PR: 244178 Reported by: Ben RUBSON Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D24012 Added: stable/12/tests/sys/fs/fusefs/cache.cc - copied unchanged from r358867, head/tests/sys/fs/fusefs/cache.cc Modified: stable/12/sys/fs/fuse/fuse_internal.c stable/12/sys/fs/fuse/fuse_node.c stable/12/sys/fs/fuse/fuse_node.h stable/12/sys/fs/fuse/fuse_vnops.c stable/12/tests/sys/fs/fusefs/Makefile stable/12/tests/sys/fs/fusefs/getattr.cc stable/12/tests/sys/fs/fusefs/io.cc stable/12/tests/sys/fs/fusefs/utils.cc stable/12/tests/sys/fs/fusefs/utils.hh Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/fs/fuse/fuse_internal.c ============================================================================== --- stable/12/sys/fs/fuse/fuse_internal.c Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/sys/fs/fuse/fuse_internal.c Sun Mar 22 15:24:25 2020 (r359214) @@ -857,6 +857,9 @@ fuse_internal_forget_send(struct mount *mp, fdisp_destroy(&fdi); } +SDT_PROBE_DEFINE2(fusefs, , internal, getattr_cache_incoherent, + "struct vnode*", "struct fuse_attr_out*"); + /* Fetch the vnode's attributes from the daemon*/ int fuse_internal_do_getattr(struct vnode *vp, struct vattr *vap, @@ -898,6 +901,24 @@ fuse_internal_do_getattr(struct vnode *vp, struct vatt if (fvdat->flag & FN_MTIMECHANGE) { fao->attr.mtime = old_mtime.tv_sec; fao->attr.mtimensec = old_mtime.tv_nsec; + } + if (vnode_isreg(vp) && + fvdat->cached_attrs.va_size != VNOVAL && + fao->attr.size != fvdat->cached_attrs.va_size) { + /* + * The server changed the file's size even though we had it + * cached! That's a server bug. + */ + SDT_PROBE2(fusefs, , internal, getattr_cache_incoherent, vp, + fao); + printf("%s: cache incoherent on %s! " + "Buggy FUSE server detected. To prevent data corruption, " + "disable the data cache by mounting with -o direct_io, or " + "as directed otherwise by your FUSE server's " + "documentation\n", __func__, + vnode_mount(vp)->mnt_stat.f_mntonname); + int iosize = fuse_iosize(vp); + v_inval_buf_range(vp, 0, INT64_MAX, iosize); } fuse_internal_cache_attrs(vp, &fao->attr, fao->attr_valid, fao->attr_valid_nsec, vap); Modified: stable/12/sys/fs/fuse/fuse_node.c ============================================================================== --- stable/12/sys/fs/fuse/fuse_node.c Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/sys/fs/fuse/fuse_node.c Sun Mar 22 15:24:25 2020 (r359214) @@ -449,7 +449,8 @@ fuse_vnode_size(struct vnode *vp, off_t *filesize, str int error = 0; if (!(fvdat->flag & FN_SIZECHANGE) && - (VTOVA(vp) == NULL || fvdat->cached_attrs.va_size == VNOVAL)) + (!fuse_vnode_attr_cache_valid(vp) || + fvdat->cached_attrs.va_size == VNOVAL)) error = fuse_internal_do_getattr(vp, NULL, cred, td); if (!error) Modified: stable/12/sys/fs/fuse/fuse_node.h ============================================================================== --- stable/12/sys/fs/fuse/fuse_node.h Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/sys/fs/fuse/fuse_node.h Sun Mar 22 15:24:25 2020 (r359214) @@ -134,13 +134,19 @@ struct fuse_fid { #define VTOFUD(vp) \ ((struct fuse_vnode_data *)((vp)->v_data)) #define VTOI(vp) (VTOFUD(vp)->nid) -static inline struct vattr* -VTOVA(struct vnode *vp) +static inline bool +fuse_vnode_attr_cache_valid(struct vnode *vp) { struct bintime now; getbinuptime(&now); - if (bintime_cmp(&(VTOFUD(vp)->attr_cache_timeout), &now, >)) + return (bintime_cmp(&(VTOFUD(vp)->attr_cache_timeout), &now, >)); +} + +static inline struct vattr* +VTOVA(struct vnode *vp) +{ + if (fuse_vnode_attr_cache_valid(vp)) return &(VTOFUD(vp)->cached_attrs); else return NULL; Modified: stable/12/sys/fs/fuse/fuse_vnops.c ============================================================================== --- stable/12/sys/fs/fuse/fuse_vnops.c Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/sys/fs/fuse/fuse_vnops.c Sun Mar 22 15:24:25 2020 (r359214) @@ -960,6 +960,8 @@ fuse_lookup_alloc(struct mount *mp, void *arg, int lkf SDT_PROBE_DEFINE3(fusefs, , vnops, cache_lookup, "int", "struct timespec*", "struct timespec*"); +SDT_PROBE_DEFINE2(fusefs, , vnops, lookup_cache_incoherent, + "struct vnode*", "struct fuse_entry_out*"); /* struct vnop_lookup_args { struct vnodeop_desc *a_desc; @@ -1136,6 +1138,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) *vpp = dvp; } else { struct fuse_vnode_data *fvdat; + struct vattr *vap; err = fuse_vnode_get(vnode_mount(dvp), feo, nid, dvp, &vp, cnp, vtyp); @@ -1156,22 +1159,27 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) */ fvdat = VTOFUD(vp); if (vnode_isreg(vp) && - filesize != fvdat->cached_attrs.va_size && - fvdat->flag & FN_SIZECHANGE) { + ((filesize != fvdat->cached_attrs.va_size && + fvdat->flag & FN_SIZECHANGE) || + ((vap = VTOVA(vp)) && + filesize != vap->va_size))) + { + SDT_PROBE2(fusefs, , vnops, lookup_cache_incoherent, vp, feo); + fvdat->flag &= ~FN_SIZECHANGE; /* - * The FN_SIZECHANGE flag reflects a dirty - * append. If userspace lets us know our cache - * is invalid, that write was lost. (Dirty - * writes that do not cause append are also - * lost, but we don't detect them here.) - * - * XXX: Maybe disable WB caching on this mount. + * The server changed the file's size even + * though we had it cached, or had dirty writes + * in the WB cache! */ - printf("%s: WB cache incoherent on %s!\n", - __func__, + printf("%s: cache incoherent on %s! " + "Buggy FUSE server detected. To prevent " + "data corruption, disable the data cache " + "by mounting with -o direct_io, or as " + "directed otherwise by your FUSE server's " + "documentation\n", __func__, vnode_mount(vp)->mnt_stat.f_mntonname); - - fvdat->flag &= ~FN_SIZECHANGE; + int iosize = fuse_iosize(vp); + v_inval_buf_range(vp, 0, INT64_MAX, iosize); } MPASS(feo != NULL); Modified: stable/12/tests/sys/fs/fusefs/Makefile ============================================================================== --- stable/12/tests/sys/fs/fusefs/Makefile Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/tests/sys/fs/fusefs/Makefile Sun Mar 22 15:24:25 2020 (r359214) @@ -10,6 +10,7 @@ TESTSDIR= ${TESTSBASE}/sys/fs/fusefs GTESTS+= access GTESTS+= allow_other GTESTS+= bmap +GTESTS+= cache GTESTS+= create GTESTS+= default_permissions GTESTS+= default_permissions_privileged Copied: stable/12/tests/sys/fs/fusefs/cache.cc (from r358867, head/tests/sys/fs/fusefs/cache.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/tests/sys/fs/fusefs/cache.cc Sun Mar 22 15:24:25 2020 (r359214, copy of r358867, head/tests/sys/fs/fusefs/cache.cc) @@ -0,0 +1,219 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Alan Somers + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +extern "C" { +#include +#include +} + +#include "mockfs.hh" +#include "utils.hh" + +/* + * Tests for thorny cache problems not specific to any one opcode + */ + +using namespace testing; + +/* + * Parameters + * - reopen file - If true, close and reopen the file between reads + * - cache lookups - If true, allow lookups to be cached + * - cache attrs - If true, allow file attributes to be cached + * - cache_mode - uncached, writeback, or writethrough + * - initial size - File size before truncation + * - truncated size - File size after truncation + */ +typedef tuple, cache_mode, ssize_t, ssize_t> CacheParam; + +class Cache: public FuseTest, public WithParamInterface { +public: +bool m_direct_io; + +Cache(): m_direct_io(false) {}; + +virtual void SetUp() { + int cache_mode = get<1>(GetParam()); + switch (cache_mode) { + case Uncached: + m_direct_io = true; + break; + case WritebackAsync: + m_async = true; + /* FALLTHROUGH */ + case Writeback: + m_init_flags |= FUSE_WRITEBACK_CACHE; + /* FALLTHROUGH */ + case Writethrough: + break; + default: + FAIL() << "Unknown cache mode"; + } + + FuseTest::SetUp(); + if (IsSkipped()) + return; +} + +void expect_getattr(uint64_t ino, int times, uint64_t size, uint64_t attr_valid) +{ + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_GETATTR && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).Times(times) + .WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto& out) { + SET_OUT_HEADER_LEN(out, attr); + out.body.attr.attr_valid = attr_valid; + out.body.attr.attr.ino = ino; + out.body.attr.attr.mode = S_IFREG | 0644; + out.body.attr.attr.size = size; + }))); +} + +void expect_lookup(const char *relpath, uint64_t ino, + uint64_t size, uint64_t entry_valid, uint64_t attr_valid) +{ + EXPECT_LOOKUP(FUSE_ROOT_ID, relpath) + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = S_IFREG | 0644; + out.body.entry.nodeid = ino; + out.body.entry.attr.nlink = 1; + out.body.entry.attr_valid = attr_valid; + out.body.entry.attr.size = size; + out.body.entry.entry_valid = entry_valid; + }))); +} + +void expect_open(uint64_t ino, int times) +{ + FuseTest::expect_open(ino, m_direct_io ? FOPEN_DIRECT_IO: 0, times); +} + +void expect_release(uint64_t ino, ProcessMockerT r) +{ + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_RELEASE && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(r)); +} + +}; + +// If the server truncates the file behind the kernel's back, the kernel should +// invalidate cached pages beyond the new EOF +TEST_P(Cache, truncate_by_surprise_invalidates_cache) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + const char *CONTENTS = "abcdefghijklmnopqrstuvwxyz"; + uint64_t ino = 42; + uint64_t attr_valid, entry_valid; + int fd; + ssize_t bufsize = strlen(CONTENTS); + uint8_t buf[bufsize]; + bool reopen = get<0>(get<0>(GetParam())); + bool cache_lookups = get<1>(get<0>(GetParam())); + bool cache_attrs = get<2>(get<0>(GetParam())); + ssize_t osize = get<2>(GetParam()); + ssize_t nsize = get<3>(GetParam()); + + ASSERT_LE(osize, bufsize); + ASSERT_LE(nsize, bufsize); + if (cache_attrs) + attr_valid = UINT64_MAX; + else + attr_valid = 0; + if (cache_lookups) + entry_valid = UINT64_MAX; + else + entry_valid = 0; + + expect_lookup(RELPATH, ino, osize, entry_valid, attr_valid); + expect_open(ino, 1); + if (!cache_attrs) + expect_getattr(ino, 2, osize, attr_valid); + expect_read(ino, 0, osize, osize, CONTENTS); + + fd = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd) << strerror(errno); + + ASSERT_EQ(osize, read(fd, buf, bufsize)) << strerror(errno); + ASSERT_EQ(0, memcmp(buf, CONTENTS, osize)); + + // Now truncate the file behind the kernel's back. The next read + // should discard cache and fetch from disk again. + if (reopen) { + // Close and reopen the file + expect_flush(ino, 1, ReturnErrno(ENOSYS)); + expect_release(ino, ReturnErrno(0)); + ASSERT_EQ(0, close(fd)); + expect_lookup(RELPATH, ino, nsize, entry_valid, attr_valid); + expect_open(ino, 1); + fd = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd) << strerror(errno); + } + + if (!cache_attrs) + expect_getattr(ino, 1, nsize, attr_valid); + expect_read(ino, 0, nsize, nsize, CONTENTS); + ASSERT_EQ(0, lseek(fd, 0, SEEK_SET)); + ASSERT_EQ(nsize, read(fd, buf, bufsize)) << strerror(errno); + ASSERT_EQ(0, memcmp(buf, CONTENTS, nsize)); + + leak(fd); +} + +INSTANTIATE_TEST_CASE_P(Cache, Cache, + Combine( + /* Test every combination that: + * - does not cache at least one of entries and attrs + * - either doesn't cache attrs, or reopens the file + * In the other combinations, the kernel will never learn that + * the file's size has changed. + */ + Values( + std::make_tuple(false, false, false), + std::make_tuple(false, true, false), + std::make_tuple(true, false, false), + std::make_tuple(true, false, true), + std::make_tuple(true, true, false) + ), + Values(Writethrough, Writeback), + /* Test both reductions and extensions to file size */ + Values(20), + Values(10, 25) + ) +); Modified: stable/12/tests/sys/fs/fusefs/getattr.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/getattr.cc Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/tests/sys/fs/fusefs/getattr.cc Sun Mar 22 15:24:25 2020 (r359214) @@ -159,6 +159,7 @@ TEST_F(Getattr, blksize_zero) out.body.attr.attr.mode = S_IFREG | 0644; out.body.attr.attr.ino = ino; // Must match nodeid out.body.attr.attr.blksize = 0; + out.body.attr.attr.size = 1; }))); ASSERT_EQ(0, stat(FULLPATH, &sb)) << strerror(errno); Modified: stable/12/tests/sys/fs/fusefs/io.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/io.cc Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/tests/sys/fs/fusefs/io.cc Sun Mar 22 15:24:25 2020 (r359214) @@ -50,28 +50,6 @@ extern "C" { using namespace testing; -enum cache_mode { - Uncached, - Writethrough, - Writeback, - WritebackAsync -}; - -const char *cache_mode_to_s(enum cache_mode cm) { - switch (cm) { - case Uncached: - return "Uncached"; - case Writethrough: - return "Writethrough"; - case Writeback: - return "Writeback"; - case WritebackAsync: - return "WritebackAsync"; - default: - return "Unknown"; - } -} - const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; const uint64_t ino = 42; Modified: stable/12/tests/sys/fs/fusefs/utils.cc ============================================================================== --- stable/12/tests/sys/fs/fusefs/utils.cc Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/tests/sys/fs/fusefs/utils.cc Sun Mar 22 15:24:25 2020 (r359214) @@ -90,6 +90,21 @@ void check_environment() GTEST_SKIP() << "current user is not allowed to mount"; } +const char *cache_mode_to_s(enum cache_mode cm) { + switch (cm) { + case Uncached: + return "Uncached"; + case Writethrough: + return "Writethrough"; + case Writeback: + return "Writeback"; + case WritebackAsync: + return "WritebackAsync"; + default: + return "Unknown"; + } +} + bool is_unsafe_aio_enabled(void) { const char *node = "vfs.aio.enable_unsafe"; int val = 0; Modified: stable/12/tests/sys/fs/fusefs/utils.hh ============================================================================== --- stable/12/tests/sys/fs/fusefs/utils.hh Sun Mar 22 15:16:59 2020 (r359213) +++ stable/12/tests/sys/fs/fusefs/utils.hh Sun Mar 22 15:24:25 2020 (r359214) @@ -44,6 +44,14 @@ inline void nap() usleep(NAP_NS / 1000); } +enum cache_mode { + Uncached, + Writethrough, + Writeback, + WritebackAsync +}; + +const char *cache_mode_to_s(enum cache_mode cm); bool is_unsafe_aio_enabled(void); extern const uint32_t libfuse_max_write; From owner-svn-src-stable-12@freebsd.org Sun Mar 22 17:13:20 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2AE482674C0; Sun, 22 Mar 2020 17:13:20 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lkcJ0Pysz493X; Sun, 22 Mar 2020 17:13:20 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09446C5A; Sun, 22 Mar 2020 17:13:20 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MHDJUs037158; Sun, 22 Mar 2020 17:13:19 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MHDJKu037157; Sun, 22 Mar 2020 17:13:19 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202003221713.02MHDJKu037157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Sun, 22 Mar 2020 17:13:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359217 - stable/12/sys/cddl/compat/opensolaris/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: stable/12/sys/cddl/compat/opensolaris/sys X-SVN-Commit-Revision: 359217 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 17:13:20 -0000 Author: freqlabs Date: Sun Mar 22 17:13:19 2020 New Revision: 359217 URL: https://svnweb.freebsd.org/changeset/base/359217 Log: MFC r358971: TODO DONE: Use sx_xholder in SPL rwlock.h Approved by: mav (mentor) Sponsored by: iXsystems, Inc. Modified: stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h ============================================================================== --- stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Sun Mar 22 16:55:20 2020 (r359216) +++ stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Sun Mar 22 17:13:19 2020 (r359217) @@ -87,8 +87,7 @@ typedef struct sx krwlock_t; #define rw_write_held(lock) sx_xlocked(lock) #define rw_lock_held(lock) (rw_read_held(lock) || rw_write_held(lock)) #define rw_iswriter(lock) sx_xlocked(lock) -/* TODO: Change to sx_xholder() once it is moved from kern_sx.c to sx.h. */ -#define rw_owner(lock) ((lock)->sx_lock & SX_LOCK_SHARED ? NULL : (struct thread *)SX_OWNER((lock)->sx_lock)) +#define rw_owner(lock) sx_xholder(lock) #endif /* defined(_KERNEL) */ From owner-svn-src-stable-12@freebsd.org Mon Mar 23 12:38:44 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A2BB42621D0; Mon, 23 Mar 2020 12:38:44 +0000 (UTC) (envelope-from dab@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mDT03wKtz4X9R; Mon, 23 Mar 2020 12:38:44 +0000 (UTC) (envelope-from dab@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E9D5E84A; Mon, 23 Mar 2020 12:38:44 +0000 (UTC) (envelope-from dab@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NCciRa031542; Mon, 23 Mar 2020 12:38:44 GMT (envelope-from dab@FreeBSD.org) Received: (from dab@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NCcico031541; Mon, 23 Mar 2020 12:38:44 GMT (envelope-from dab@FreeBSD.org) Message-Id: <202003231238.02NCcico031541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dab set sender to dab@FreeBSD.org using -f From: David Bright Date: Mon, 23 Mar 2020 12:38:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359236 - stable/12/sys/cam/nvme X-SVN-Group: stable-12 X-SVN-Commit-Author: dab X-SVN-Commit-Paths: stable/12/sys/cam/nvme X-SVN-Commit-Revision: 359236 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 12:38:44 -0000 Author: dab Date: Mon Mar 23 12:38:44 2020 New Revision: 359236 URL: https://svnweb.freebsd.org/changeset/base/359236 Log: MFC r359129: Fix parameter reversal potentially causing buffer overrun. Two arguments were reversed in calls to cam_strvis() in nvme_da.c. This was found by a Coverity scan of this code within Dell (Isilon). These are also marked in the FreeBSD Coverity scan as CIDs 1400526 & 1400531. Sponsored by: Dell EMC Isilon Modified: stable/12/sys/cam/nvme/nvme_da.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cam/nvme/nvme_da.c ============================================================================== --- stable/12/sys/cam/nvme/nvme_da.c Mon Mar 23 12:21:32 2020 (r359235) +++ stable/12/sys/cam/nvme/nvme_da.c Mon Mar 23 12:38:44 2020 (r359236) @@ -798,9 +798,9 @@ ndaregister(struct cam_periph *periph, void *arg) * the serial or model number strings. */ cam_strvis(disk->d_descr, cd->mn, - sizeof(disk->d_descr), NVME_MODEL_NUMBER_LENGTH); + NVME_MODEL_NUMBER_LENGTH, sizeof(disk->d_descr)); cam_strvis(disk->d_ident, cd->sn, - sizeof(disk->d_ident), NVME_SERIAL_NUMBER_LENGTH); + NVME_SERIAL_NUMBER_LENGTH, sizeof(disk->d_ident)); disk->d_hba_vendor = cpi.hba_vendor; disk->d_hba_device = cpi.hba_device; disk->d_hba_subvendor = cpi.hba_subvendor; From owner-svn-src-stable-12@freebsd.org Mon Mar 23 17:45:31 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BE85F269988; Mon, 23 Mar 2020 17:45:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mMGz4TsFz4L65; Mon, 23 Mar 2020 17:45:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F3361A34F; Mon, 23 Mar 2020 17:45:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NHjVf9018795; Mon, 23 Mar 2020 17:45:31 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NHjVTW018794; Mon, 23 Mar 2020 17:45:31 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202003231745.02NHjVTW018794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 23 Mar 2020 17:45:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359249 - stable/12/share/mk X-SVN-Group: stable-12 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: stable/12/share/mk X-SVN-Commit-Revision: 359249 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 17:45:31 -0000 Author: brooks Date: Mon Mar 23 17:45:31 2020 New Revision: 359249 URL: https://svnweb.freebsd.org/changeset/base/359249 Log: MFC r359046: Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions. This allows simplification of Makefiles where some SUBDIR entries depend on two things (e.g. something that depends on C++ and some other knob). Discussed with: imp, jhb Obtained from: CheriBSD Sponsored by: DARPA Modified: stable/12/share/mk/bsd.subdir.mk Directory Properties: stable/12/ (props changed) Modified: stable/12/share/mk/bsd.subdir.mk ============================================================================== --- stable/12/share/mk/bsd.subdir.mk Mon Mar 23 17:38:20 2020 (r359248) +++ stable/12/share/mk/bsd.subdir.mk Mon Mar 23 17:45:31 2020 (r359249) @@ -16,8 +16,8 @@ # # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the -# subdirectories. SUBDIR.yes is automatically appended -# to this list. +# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are +# automatically appended to this list. # # +++ targets +++ # @@ -122,8 +122,8 @@ install: beforeinstall realinstall afterinstall # SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD .if !target(_SUBDIR) -.if defined(SUBDIR) || defined(SUBDIR.yes) -SUBDIR:=${SUBDIR} ${SUBDIR.yes} +.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes) +SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes} SUBDIR:=${SUBDIR:u} .endif From owner-svn-src-stable-12@freebsd.org Mon Mar 23 18:31:14 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B025626AE9F; Mon, 23 Mar 2020 18:31:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mNHk43LQz4JdN; Mon, 23 Mar 2020 18:31:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 840B91AB00; Mon, 23 Mar 2020 18:31:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NIVEFR046378; Mon, 23 Mar 2020 18:31:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NIVEL9046376; Mon, 23 Mar 2020 18:31:14 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003231831.02NIVEL9046376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 23 Mar 2020 18:31:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359256 - in stable/12/sys/dev/usb: . serial X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/12/sys/dev/usb: . serial X-SVN-Commit-Revision: 359256 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 18:31:14 -0000 Author: hselasky Date: Mon Mar 23 18:31:13 2020 New Revision: 359256 URL: https://svnweb.freebsd.org/changeset/base/359256 Log: MFC r359031: Add new USB device ID to u3g driver. Submitted by: super_gromit@hotmail.com PR: 244798 Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/usb/serial/u3g.c stable/12/sys/dev/usb/usbdevs Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/serial/u3g.c ============================================================================== --- stable/12/sys/dev/usb/serial/u3g.c Mon Mar 23 18:26:23 2020 (r359255) +++ stable/12/sys/dev/usb/serial/u3g.c Mon Mar 23 18:31:13 2020 (r359256) @@ -238,6 +238,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(DLINK, DWR510, 0), U3G_DEV(DLINK, DWM157_CD, U3GINIT_SCSIEJECT), U3G_DEV(DLINK, DWM157, 0), + U3G_DEV(DLINK, DWM157_CD_2, U3GINIT_SCSIEJECT), + U3G_DEV(DLINK, DWM157_2, 0), U3G_DEV(DLINK, DWM222_CD, U3GINIT_SCSIEJECT), U3G_DEV(DLINK, DWM222, 0), U3G_DEV(DLINK3, DWM652, 0), Modified: stable/12/sys/dev/usb/usbdevs ============================================================================== --- stable/12/sys/dev/usb/usbdevs Mon Mar 23 18:26:23 2020 (r359255) +++ stable/12/sys/dev/usb/usbdevs Mon Mar 23 18:31:13 2020 (r359256) @@ -1736,8 +1736,10 @@ product DLINK DSB650TX3 0x400b 10/100 Ethernet product DLINK DSB650TX2 0x4102 10/100 Ethernet product DLINK DUB1312 0x4a00 10/100/1000 Ethernet product DLINK DWM157 0x7d02 DWM-157 +product DLINK DWM157_2 0x7d0e DWM-157 product DLINK DWR510 0x7e12 DWR-510 product DLINK DWM222 0x7e35 DWM-222 +product DLINK DWM157_CD_2 0xa407 DWM-157 CD-ROM Mode product DLINK DWM157_CD 0xa707 DWM-157 CD-ROM Mode product DLINK DWR510_CD 0xa805 DWR-510 CD-ROM Mode product DLINK DWM222_CD 0xab00 DWM-222 CD-ROM Mode From owner-svn-src-stable-12@freebsd.org Tue Mar 24 19:09:47 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46ACC267AA2; Tue, 24 Mar 2020 19:09:47 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48n15j6XyKz4cDX; Tue, 24 Mar 2020 19:09:45 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F23124972; Tue, 24 Mar 2020 19:09:37 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02OJ9bm6034363; Tue, 24 Mar 2020 19:09:37 GMT (envelope-from carlavilla@FreeBSD.org) Received: (from carlavilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02OJ9brh034362; Tue, 24 Mar 2020 19:09:37 GMT (envelope-from carlavilla@FreeBSD.org) Message-Id: <202003241909.02OJ9brh034362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: carlavilla set sender to carlavilla@FreeBSD.org using -f From: Sergio Carlavilla Delgado Date: Tue, 24 Mar 2020 19:09:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359281 - stable/12/lib/libc/gen X-SVN-Group: stable-12 X-SVN-Commit-Author: carlavilla X-SVN-Commit-Paths: stable/12/lib/libc/gen X-SVN-Commit-Revision: 359281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 19:09:47 -0000 Author: carlavilla (doc committer) Date: Tue Mar 24 19:09:37 2020 New Revision: 359281 URL: https://svnweb.freebsd.org/changeset/base/359281 Log: MFC r359210: Add HISTORY section to exec(3) Submitted by: gbergling@gmail.com Approved by: bcr@(mentor) Modified: stable/12/lib/libc/gen/exec.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/gen/exec.3 ============================================================================== --- stable/12/lib/libc/gen/exec.3 Tue Mar 24 18:43:23 2020 (r359280) +++ stable/12/lib/libc/gen/exec.3 Tue Mar 24 19:09:37 2020 (r359281) @@ -28,7 +28,7 @@ .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 .\" $FreeBSD$ .\" -.Dd July 28, 2018 +.Dd March 22, 2020 .Dt EXEC 3 .Os .Sh NAME @@ -310,6 +310,11 @@ and functions conform to .St -p1003.1-88 . +.Sh HISTORY +The +.Fn exec +function appeared in +.At v1 . The .Fn execvP function first appeared in From owner-svn-src-stable-12@freebsd.org Wed Mar 25 00:52:38 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6C18927017C; Wed, 25 Mar 2020 00:52:38 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48n8jJ1WQMz3KnX; Wed, 25 Mar 2020 00:52:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F48F92F4; Wed, 25 Mar 2020 00:31:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02P0VpPG032164; Wed, 25 Mar 2020 00:31:51 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02P0Vl82032143; Wed, 25 Mar 2020 00:31:47 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202003250031.02P0Vl82032143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 25 Mar 2020 00:31:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359290 - in stable: 11/usr.bin/hexdump/tests 12/usr.bin/hexdump/tests X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/usr.bin/hexdump/tests 12/usr.bin/hexdump/tests X-SVN-Commit-Revision: 359290 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 00:52:40 -0000 Author: kevans Date: Wed Mar 25 00:31:42 2020 New Revision: 359290 URL: https://svnweb.freebsd.org/changeset/base/359290 Log: MFC r358553: hexdump: tests: take into account byte order Hexdump test was failling on big endian systems when testing decimal, octal and hexa outputs as the tests were designed on a little endian system. This revision adds the two distinct flavors of output expected and determines at runtime which to compare against. Added: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out Deleted: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b.out stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c.out Modified: stable/12/usr.bin/hexdump/tests/Makefile stable/12/usr.bin/hexdump/tests/hexdump_test.sh Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out - copied unchanged from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out Deleted: stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_dflag_c.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_oflag_c.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_a.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_b.out stable/11/usr.bin/hexdump/tests/d_hexdump_xflag_c.out Modified: stable/11/usr.bin/hexdump/tests/Makefile stable/11/usr.bin/hexdump/tests/hexdump_test.sh Directory Properties: stable/11/ (props changed) Modified: stable/12/usr.bin/hexdump/tests/Makefile ============================================================================== --- stable/12/usr.bin/hexdump/tests/Makefile Tue Mar 24 23:25:54 2020 (r359289) +++ stable/12/usr.bin/hexdump/tests/Makefile Wed Mar 25 00:31:42 2020 (r359290) @@ -13,20 +13,29 @@ ${PACKAGE}FILES+= d_hexdump_bflag_c.out ${PACKAGE}FILES+= d_hexdump_cflag_a.out ${PACKAGE}FILES+= d_hexdump_cflag_b.out ${PACKAGE}FILES+= d_hexdump_cflag_c.out -${PACKAGE}FILES+= d_hexdump_dflag_a.out -${PACKAGE}FILES+= d_hexdump_dflag_b.out -${PACKAGE}FILES+= d_hexdump_dflag_c.out +${PACKAGE}FILES+= d_hexdump_dflag_a_el.out +${PACKAGE}FILES+= d_hexdump_dflag_b_el.out +${PACKAGE}FILES+= d_hexdump_dflag_c_el.out +${PACKAGE}FILES+= d_hexdump_dflag_a_eb.out +${PACKAGE}FILES+= d_hexdump_dflag_b_eb.out +${PACKAGE}FILES+= d_hexdump_dflag_c_eb.out ${PACKAGE}FILES+= d_hexdump_nflag_a.out -${PACKAGE}FILES+= d_hexdump_oflag_a.out -${PACKAGE}FILES+= d_hexdump_oflag_b.out -${PACKAGE}FILES+= d_hexdump_oflag_c.out +${PACKAGE}FILES+= d_hexdump_oflag_a_el.out +${PACKAGE}FILES+= d_hexdump_oflag_b_el.out +${PACKAGE}FILES+= d_hexdump_oflag_c_el.out +${PACKAGE}FILES+= d_hexdump_oflag_a_eb.out +${PACKAGE}FILES+= d_hexdump_oflag_b_eb.out +${PACKAGE}FILES+= d_hexdump_oflag_c_eb.out ${PACKAGE}FILES+= d_hexdump_sflag_a.out ${PACKAGE}FILES+= d_hexdump_UCflag_a.out ${PACKAGE}FILES+= d_hexdump_UCflag_b.out ${PACKAGE}FILES+= d_hexdump_UCflag_c.out -${PACKAGE}FILES+= d_hexdump_xflag_a.out -${PACKAGE}FILES+= d_hexdump_xflag_b.out -${PACKAGE}FILES+= d_hexdump_xflag_c.out +${PACKAGE}FILES+= d_hexdump_xflag_a_el.out +${PACKAGE}FILES+= d_hexdump_xflag_b_el.out +${PACKAGE}FILES+= d_hexdump_xflag_c_el.out +${PACKAGE}FILES+= d_hexdump_xflag_a_eb.out +${PACKAGE}FILES+= d_hexdump_xflag_b_eb.out +${PACKAGE}FILES+= d_hexdump_xflag_c_eb.out ${PACKAGE}FILES+= d_od_cflag_a.out ${PACKAGE}FILES+= d_od_cflag_b.out Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_eb.out) @@ -0,0 +1,2 @@ +0000000 21605 29556 02560 +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_a_el.out) @@ -0,0 +1,2 @@ +0000000 25940 29811 00010 +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_eb.out) @@ -0,0 +1,4 @@ +0000000 21608 25888 29045 26979 27424 25202 28535 28192 +0000010 26223 30752 27253 28016 25956 08303 30309 29216 +0000020 29800 25888 25196 30053 08296 28533 29541 02570 +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_b_el.out) @@ -0,0 +1,4 @@ +0000000 26708 08293 30065 25449 08299 29282 30575 08302 +0000010 28518 08312 30058 28781 25701 28448 25974 08306 +0000020 26740 08293 27746 25973 26656 30063 25971 02570 +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_eb.out) @@ -0,0 +1,4 @@ +0000000 16705 16705 16705 16705 16705 16705 16705 16705 +* +0000020 16705 16705 16705 16650 +0000028 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_dflag_c_el.out) @@ -0,0 +1,4 @@ +0000000 16705 16705 16705 16705 16705 16705 16705 16705 +* +0000020 16705 16705 16705 02625 +0000028 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_eb.out) @@ -0,0 +1,2 @@ +0000000 052145 071564 005000 +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_a_el.out) @@ -0,0 +1,2 @@ +0000000 062524 072163 000012 +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_eb.out) @@ -0,0 +1,4 @@ +0000000 052150 062440 070565 064543 065440 061162 067567 067040 +0000010 063157 074040 065165 066560 062544 020157 073145 071040 +0000020 072150 062440 061154 072545 020150 067565 071545 005012 +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_b_el.out) @@ -0,0 +1,4 @@ +0000000 064124 020145 072561 061551 020153 071142 073557 020156 +0000010 067546 020170 072552 070155 062145 067440 062566 020162 +0000020 064164 020145 066142 062565 064040 072557 062563 005012 +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_eb.out) @@ -0,0 +1,4 @@ +0000000 040501 040501 040501 040501 040501 040501 040501 040501 +* +0000020 040501 040501 040501 040412 +0000028 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_oflag_c_el.out) @@ -0,0 +1,4 @@ +0000000 040501 040501 040501 040501 040501 040501 040501 040501 +* +0000020 040501 040501 040501 005101 +0000028 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_eb.out) @@ -0,0 +1,2 @@ +0000000 5465 7374 0a00 +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_a_el.out) @@ -0,0 +1,2 @@ +0000000 6554 7473 000a +0000005 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_eb.out) @@ -0,0 +1,4 @@ +0000000 5468 6520 7175 6963 6b20 6272 6f77 6e20 +0000010 666f 7820 6a75 6d70 6564 206f 7665 7220 +0000020 7468 6520 626c 7565 2068 6f75 7365 0a0a +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_b_el.out) @@ -0,0 +1,4 @@ +0000000 6854 2065 7571 6369 206b 7262 776f 206e +0000010 6f66 2078 756a 706d 6465 6f20 6576 2072 +0000020 6874 2065 6c62 6575 6820 756f 6573 0a0a +0000030 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_eb.out) @@ -0,0 +1,4 @@ +0000000 4141 4141 4141 4141 4141 4141 4141 4141 +* +0000020 4141 4141 4141 410a +0000028 Copied: stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out (from r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out Wed Mar 25 00:31:42 2020 (r359290, copy of r358553, head/usr.bin/hexdump/tests/d_hexdump_xflag_c_el.out) @@ -0,0 +1,4 @@ +0000000 4141 4141 4141 4141 4141 4141 4141 4141 +* +0000020 4141 4141 4141 0a41 +0000028 Modified: stable/12/usr.bin/hexdump/tests/hexdump_test.sh ============================================================================== --- stable/12/usr.bin/hexdump/tests/hexdump_test.sh Tue Mar 24 23:25:54 2020 (r359289) +++ stable/12/usr.bin/hexdump/tests/hexdump_test.sh Wed Mar 25 00:31:42 2020 (r359290) @@ -26,6 +26,12 @@ # # $FreeBSD$ +ENDIAN=el +ret=$(echo I | tr -d "[:space:]" | od -to2 | head -n1 | awk '{print $2}' | cut -c6) +if [ "$ret" = "0" ]; then + ENDIAN=eb +fi + atf_test_case b_flag b_flag_head() { @@ -93,11 +99,11 @@ d_flag_head() } d_flag_body() { - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_a.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_a_$ENDIAN.out" \ hexdump -d "$(atf_get_srcdir)/d_hexdump_a.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_b.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_b_$ENDIAN.out" \ hexdump -d "$(atf_get_srcdir)/d_hexdump_b.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_c.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_dflag_c_$ENDIAN.out" \ hexdump -d "$(atf_get_srcdir)/d_hexdump_c.in" } @@ -120,11 +126,11 @@ o_flag_head() } o_flag_body() { - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_a.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_a_$ENDIAN.out" \ hexdump -o "$(atf_get_srcdir)/d_hexdump_a.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_b.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_b_$ENDIAN.out" \ hexdump -o "$(atf_get_srcdir)/d_hexdump_b.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_c.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_oflag_c_$ENDIAN.out" \ hexdump -o "$(atf_get_srcdir)/d_hexdump_c.in" } @@ -168,11 +174,11 @@ x_flag_head() } x_flag_body() { - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_a.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_a_$ENDIAN.out" \ hexdump -x "$(atf_get_srcdir)/d_hexdump_a.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_b.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_b_$ENDIAN.out" \ hexdump -x "$(atf_get_srcdir)/d_hexdump_b.in" - atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_c.out" \ + atf_check -o file:"$(atf_get_srcdir)/d_hexdump_xflag_c_$ENDIAN.out" \ hexdump -x "$(atf_get_srcdir)/d_hexdump_c.in" } From owner-svn-src-stable-12@freebsd.org Wed Mar 25 08:48:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 550BC27ACED; Wed, 25 Mar 2020 08:48:36 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nMGV12lrz4Z61; Wed, 25 Mar 2020 08:48:33 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14B3CFE1B; Wed, 25 Mar 2020 08:48:25 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02P8mOi7026592; Wed, 25 Mar 2020 08:48:24 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02P8mOBC026591; Wed, 25 Mar 2020 08:48:24 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003250848.02P8mOBC026591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 25 Mar 2020 08:48:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359297 - stable/12/usr.bin/tail X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/usr.bin/tail X-SVN-Commit-Revision: 359297 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 08:48:36 -0000 Author: 0mp (doc,ports committer) Date: Wed Mar 25 08:48:24 2020 New Revision: 359297 URL: https://svnweb.freebsd.org/changeset/base/359297 Log: MFC 359229: Use -F instead of -f in tail(1) examples There is an example in tail(1) manual page explaining how to use tail(1) to track the contents of /var/log/messages. The example uses the -f flag to follow the file. The problem with the -f flag is that it cannot handle the situation where /var/log/messages is rotated. Hence, use -F instead in the example. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D24157 Modified: stable/12/usr.bin/tail/tail.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/tail/tail.1 ============================================================================== --- stable/12/usr.bin/tail/tail.1 Wed Mar 25 08:35:55 2020 (r359296) +++ stable/12/usr.bin/tail/tail.1 Wed Mar 25 08:48:24 2020 (r359297) @@ -31,7 +31,7 @@ .\" @(#)tail.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd April 10, 2018 +.Dd March 22, 2020 .Dt TAIL 1 .Os .Sh NAME @@ -157,7 +157,7 @@ Keep .Pa /var/log/messages open, displaying to the standard output anything appended to the file: .Pp -.Dl $ tail -f /var/log/messages +.Dl $ tail -F /var/log/messages .Sh SEE ALSO .Xr cat 1 , .Xr head 1 , From owner-svn-src-stable-12@freebsd.org Wed Mar 25 16:31:16 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8760F2A5A09; Wed, 25 Mar 2020 16:31:16 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nYXL3hDnz4XK4; Wed, 25 Mar 2020 16:31:14 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 615D51DD86; Wed, 25 Mar 2020 16:24:29 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PGOTAm002679; Wed, 25 Mar 2020 16:24:29 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PGOTTk002678; Wed, 25 Mar 2020 16:24:29 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202003251624.02PGOTTk002678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 25 Mar 2020 16:24:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359304 - stable/12/stand/lua X-SVN-Group: stable-12 X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: stable/12/stand/lua X-SVN-Commit-Revision: 359304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 16:31:17 -0000 Author: freqlabs Date: Wed Mar 25 16:24:28 2020 New Revision: 359304 URL: https://svnweb.freebsd.org/changeset/base/359304 Log: MFC r359072-r359073 loader: Add a "kernel.loaded" hook This hook can be useful, for example to run a local function to choose different modules to load when a user has picked a different kernel from the menu. Reviewed by: kevans Approved by: mav (mentor) Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D24115 Modified: stable/12/stand/lua/config.lua Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/lua/config.lua ============================================================================== --- stable/12/stand/lua/config.lua Wed Mar 25 15:56:18 2020 (r359303) +++ stable/12/stand/lua/config.lua Wed Mar 25 16:24:28 2020 (r359304) @@ -623,7 +623,7 @@ end function config.loadelf() local xen_kernel = loader.getenv('xen_kernel') local kernel = config.kernel_selected or config.kernel_loaded - local loaded, status + local status if xen_kernel ~= nil then print(MSG_XENKERNLOADING) @@ -633,11 +633,10 @@ function config.loadelf() end end print(MSG_KERNLOADING) - loaded = config.loadKernel(kernel) - - if not loaded then + if not config.loadKernel(kernel) then return false end + hook.runAll("kernel.loaded") print(MSG_MODLOADING) status = loadModule(modules, not config.verbose) @@ -647,5 +646,6 @@ end hook.registerType("config.loaded") hook.registerType("config.reloaded") +hook.registerType("kernel.loaded") hook.registerType("modules.loaded") return config From owner-svn-src-stable-12@freebsd.org Wed Mar 25 20:16:37 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EFE84262A5B; Wed, 25 Mar 2020 20:16:36 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nfXM28xDz40sc; Wed, 25 Mar 2020 20:16:34 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5799920E92; Wed, 25 Mar 2020 20:16:25 +0000 (UTC) (envelope-from carlavilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PKGPaD042210; Wed, 25 Mar 2020 20:16:25 GMT (envelope-from carlavilla@FreeBSD.org) Received: (from carlavilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PKGPlr042209; Wed, 25 Mar 2020 20:16:25 GMT (envelope-from carlavilla@FreeBSD.org) Message-Id: <202003252016.02PKGPlr042209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: carlavilla set sender to carlavilla@FreeBSD.org using -f From: Sergio Carlavilla Delgado Date: Wed, 25 Mar 2020 20:16:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359308 - stable/12/usr.sbin/ypldap X-SVN-Group: stable-12 X-SVN-Commit-Author: carlavilla X-SVN-Commit-Paths: stable/12/usr.sbin/ypldap X-SVN-Commit-Revision: 359308 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 20:16:37 -0000 Author: carlavilla (doc committer) Date: Wed Mar 25 20:16:24 2020 New Revision: 359308 URL: https://svnweb.freebsd.org/changeset/base/359308 Log: MFC r359282 Correct path in EXAMPLES ypldap.conf.5 Submitted by: alex@i.org.ua Approved by: bcr@(mentor) Modified: stable/12/usr.sbin/ypldap/ypldap.conf.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/ypldap/ypldap.conf.5 ============================================================================== --- stable/12/usr.sbin/ypldap/ypldap.conf.5 Wed Mar 25 19:12:19 2020 (r359307) +++ stable/12/usr.sbin/ypldap/ypldap.conf.5 Wed Mar 25 20:16:24 2020 (r359308) @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 13 2016 $ +.Dd $Mdocdate: March 22 2020 $ .Dt YPLDAP.CONF 5 .Os .Sh NAME @@ -155,7 +155,7 @@ Use the supplied LDAP filter to retrieve password entr .It Pa /etc/ypldap.conf .Xr ypldap 8 configuration file. -.It Pa /usr/share/example/ypldap/ypldap.conf +.It Pa /usr/share/examples/ypldap/ypldap.conf .Xr ypldap 8 configuration file example. .El From owner-svn-src-stable-12@freebsd.org Thu Mar 26 00:31:29 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E33892692E3; Thu, 26 Mar 2020 00:31:28 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nmBR04Cgz4dSf; Thu, 26 Mar 2020 00:31:27 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E2B09247E1; Thu, 26 Mar 2020 00:31:21 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02Q0VLiB097696; Thu, 26 Mar 2020 00:31:21 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02Q0VLZb097695; Thu, 26 Mar 2020 00:31:21 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003260031.02Q0VLZb097695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 26 Mar 2020 00:31:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359312 - stable/12/sys/dev/cxgbe/tom X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/tom X-SVN-Commit-Revision: 359312 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 00:31:29 -0000 Author: np Date: Thu Mar 26 00:31:21 2020 New Revision: 359312 URL: https://svnweb.freebsd.org/changeset/base/359312 Log: MFC r358860: cxgbe/t4_tom: The MSS in a FLOWC work request must not be 0. Submitted by: jhb@ Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c Wed Mar 25 23:12:43 2020 (r359311) +++ stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c Thu Mar 26 00:31:21 2020 (r359312) @@ -156,11 +156,12 @@ send_flowc_wr(struct toepcb *toep, struct tcpcb *tp) FLOWC_PARAM(PORT, pi->tx_chan); FLOWC_PARAM(IQID, toep->ofld_rxq->iq.abs_id); FLOWC_PARAM(SNDBUF, toep->params.sndbuf); - FLOWC_PARAM(MSS, toep->params.emss); if (tp) { + FLOWC_PARAM(MSS, toep->params.emss); FLOWC_PARAM(SNDNXT, tp->snd_nxt); FLOWC_PARAM(RCVNXT, tp->rcv_nxt); - } + } else + FLOWC_PARAM(MSS, 512); CTR6(KTR_CXGBE, "%s: tid %u, mss %u, sndbuf %u, snd_nxt 0x%x, rcv_nxt 0x%x", __func__, toep->tid, toep->params.emss, toep->params.sndbuf, From owner-svn-src-stable-12@freebsd.org Thu Mar 26 00:39:45 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1475269670; Thu, 26 Mar 2020 00:39:44 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nmMz5JTwz3CXM; Thu, 26 Mar 2020 00:39:43 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15C5224879; Thu, 26 Mar 2020 00:39:37 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02Q0dak8002370; Thu, 26 Mar 2020 00:39:36 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02Q0daLw002369; Thu, 26 Mar 2020 00:39:36 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003260039.02Q0daLw002369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 26 Mar 2020 00:39:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359313 - stable/12/sys/dev/pci X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/pci X-SVN-Commit-Revision: 359313 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 00:39:45 -0000 Author: np Date: Thu Mar 26 00:39:36 2020 New Revision: 359313 URL: https://svnweb.freebsd.org/changeset/base/359313 Log: MFC r359057: Remove spurious warning about invalid VPD data. The warning used to be displayed for valid VPDs about 512B or above in size. Fix the size check and add a break while here so that the routine stops if if detects any problem. Tested with "pciconf -lV" Reviewed by: kib@, jhb@ Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D23679 Modified: stable/12/sys/dev/pci/pci.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/pci/pci.c ============================================================================== --- stable/12/sys/dev/pci/pci.c Thu Mar 26 00:31:21 2020 (r359312) +++ stable/12/sys/dev/pci/pci.c Thu Mar 26 00:39:36 2020 (r359313) @@ -1105,16 +1105,16 @@ pci_read_vpd(device_t pcib, pcicfgregs *cfg) break; } remain |= byte2 << 8; - if (remain > (0x7f*4 - vrs.off)) { - state = -1; - pci_printf(cfg, - "invalid VPD data, remain %#x\n", - remain); - } name = byte & 0x7f; } else { remain = byte & 0x7; name = (byte >> 3) & 0xf; + } + if (vrs.off + remain - vrs.bytesinval > 0x8000) { + pci_printf(cfg, + "VPD data overflow, remain %#x\n", remain); + state = -1; + break; } switch (name) { case 0x2: /* String */ From owner-svn-src-stable-12@freebsd.org Thu Mar 26 00:42:40 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ADF91269908; Thu, 26 Mar 2020 00:42:40 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nmRM37Vnz3Dj5; Thu, 26 Mar 2020 00:42:39 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0030F24A47; Thu, 26 Mar 2020 00:42:31 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02Q0gVKi007758; Thu, 26 Mar 2020 00:42:31 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02Q0gVWM007757; Thu, 26 Mar 2020 00:42:31 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202003260042.02Q0gVWM007757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 26 Mar 2020 00:42:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359314 - stable/12/sys/cam/scsi X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sys/cam/scsi X-SVN-Commit-Revision: 359314 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 00:42:40 -0000 Author: mav Date: Thu Mar 26 00:42:31 2020 New Revision: 359314 URL: https://svnweb.freebsd.org/changeset/base/359314 Log: MFC r359146: Fix SES on device slots without phys after r349321. Broadcom 9400-8i8e HBAs report virtual SES device, where slots representing external connectors are reported having no phys. Since sasdev_phys is NULL there and proto_hdr is a union, ses_paths_iter() misinterpreted them as ATA. Add explicit protocol check to properly differentiate them. Modified: stable/12/sys/cam/scsi/scsi_enc_ses.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- stable/12/sys/cam/scsi/scsi_enc_ses.c Thu Mar 26 00:39:36 2020 (r359313) +++ stable/12/sys/cam/scsi/scsi_enc_ses.c Thu Mar 26 00:42:31 2020 (r359314) @@ -956,30 +956,38 @@ ses_paths_iter(enc_softc_t *enc, enc_element_t *elm, if (addl->hdr == NULL) return; - if (addl->proto_hdr.sas != NULL && - addl->proto_data.sasdev_phys != NULL) { - ses_path_iter_args_t args; + switch(ses_elm_addlstatus_proto(addl->hdr)) { + case SPSP_PROTO_SAS: + if (addl->proto_hdr.sas != NULL && + addl->proto_data.sasdev_phys != NULL) { + ses_path_iter_args_t args; - args.callback = callback; - args.callback_arg = callback_arg; - ses_devids_iter(enc, elm, ses_path_iter_devid_callback, &args); - } else if (addl->proto_hdr.ata != NULL) { - struct cam_path *path; - struct ccb_getdev cgd; + args.callback = callback; + args.callback_arg = callback_arg; + ses_devids_iter(enc, elm, ses_path_iter_devid_callback, + &args); + } + break; + case SPSP_PROTO_ATA: + if (addl->proto_hdr.ata != NULL) { + struct cam_path *path; + struct ccb_getdev cgd; - if (xpt_create_path(&path, /*periph*/NULL, - scsi_4btoul(addl->proto_hdr.ata->bus), - scsi_4btoul(addl->proto_hdr.ata->target), 0) - != CAM_REQ_CMP) - return; + if (xpt_create_path(&path, /*periph*/NULL, + scsi_4btoul(addl->proto_hdr.ata->bus), + scsi_4btoul(addl->proto_hdr.ata->target), 0) + != CAM_REQ_CMP) + return; - xpt_setup_ccb(&cgd.ccb_h, path, CAM_PRIORITY_NORMAL); - cgd.ccb_h.func_code = XPT_GDEV_TYPE; - xpt_action((union ccb *)&cgd); - if (cgd.ccb_h.status == CAM_REQ_CMP) - callback(enc, elm, path, callback_arg); + xpt_setup_ccb(&cgd.ccb_h, path, CAM_PRIORITY_NORMAL); + cgd.ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)&cgd); + if (cgd.ccb_h.status == CAM_REQ_CMP) + callback(enc, elm, path, callback_arg); - xpt_free_path(path); + xpt_free_path(path); + } + break; } } From owner-svn-src-stable-12@freebsd.org Thu Mar 26 05:37:19 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1791A2748E6; Thu, 26 Mar 2020 05:37:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ntzK6Kwmz4Ygv; Thu, 26 Mar 2020 05:37:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E497783B; Thu, 26 Mar 2020 05:37:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02Q5b8NC081829; Thu, 26 Mar 2020 05:37:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02Q5b8vb081827; Thu, 26 Mar 2020 05:37:08 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202003260537.02Q5b8vb081827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 26 Mar 2020 05:37:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359316 - stable/12/sys/dev/usb X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/dev/usb X-SVN-Commit-Revision: 359316 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 05:37:19 -0000 Author: hselasky Date: Thu Mar 26 05:37:08 2020 New Revision: 359316 URL: https://svnweb.freebsd.org/changeset/base/359316 Log: MFC r359120: Correctly implement support for remote wakeup for USB 3.0 device. Submitted by: Horse Ma Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/usb/usb.h stable/12/sys/dev/usb/usb_hub.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/usb.h ============================================================================== --- stable/12/sys/dev/usb/usb.h Thu Mar 26 00:43:04 2020 (r359315) +++ stable/12/sys/dev/usb/usb.h Thu Mar 26 05:37:08 2020 (r359316) @@ -274,6 +274,11 @@ typedef struct usb_device_request usb_device_request_t #define UHF_C_BH_PORT_RESET 29 #define UHF_FORCE_LINKPM_ACCEPT 30 +/* SuperSpeed suspend support */ +#define USB_INTERFACE_FUNC_SUSPEND 0 +#define USB_INTERFACE_FUNC_SUSPEND_LP (1 << 8) +#define USB_INTERFACE_FUNC_SUSPEND_RW (1 << 9) + struct usb_descriptor { uByte bLength; uByte bDescriptorType; Modified: stable/12/sys/dev/usb/usb_hub.c ============================================================================== --- stable/12/sys/dev/usb/usb_hub.c Thu Mar 26 00:43:04 2020 (r359315) +++ stable/12/sys/dev/usb/usb_hub.c Thu Mar 26 05:37:08 2020 (r359316) @@ -2608,6 +2608,50 @@ usb_bus_powerd(struct usb_bus *bus) } #endif +static usb_error_t +usbd_device_30_remote_wakeup(struct usb_device *udev, uint8_t bRequest) +{ + struct usb_device_request req = {}; + + req.bmRequestType = UT_WRITE_INTERFACE; + req.bRequest = bRequest; + USETW(req.wValue, USB_INTERFACE_FUNC_SUSPEND); + USETW(req.wIndex, USB_INTERFACE_FUNC_SUSPEND_LP | + USB_INTERFACE_FUNC_SUSPEND_RW); + + return (usbd_do_request(udev, NULL, &req, 0)); +} + +static usb_error_t +usbd_clear_dev_wakeup(struct usb_device *udev) +{ + usb_error_t err; + + if (usb_device_20_compatible(udev)) { + err = usbd_req_clear_device_feature(udev, + NULL, UF_DEVICE_REMOTE_WAKEUP); + } else { + err = usbd_device_30_remote_wakeup(udev, + UR_CLEAR_FEATURE); + } + return (err); +} + +static usb_error_t +usbd_set_dev_wakeup(struct usb_device *udev) +{ + usb_error_t err; + + if (usb_device_20_compatible(udev)) { + err = usbd_req_set_device_feature(udev, + NULL, UF_DEVICE_REMOTE_WAKEUP); + } else { + err = usbd_device_30_remote_wakeup(udev, + UR_SET_FEATURE); + } + return (err); +} + /*------------------------------------------------------------------------* * usb_dev_resume_peer * @@ -2711,8 +2755,7 @@ usb_dev_resume_peer(struct usb_device *udev) /* check if peer has wakeup capability */ if (usb_peer_can_wakeup(udev)) { /* clear remote wakeup */ - err = usbd_req_clear_device_feature(udev, - NULL, UF_DEVICE_REMOTE_WAKEUP); + err = usbd_clear_dev_wakeup(udev); if (err) { DPRINTFN(0, "Clearing device " "remote wakeup failed: %s\n", @@ -2777,8 +2820,7 @@ repeat: */ /* allow device to do remote wakeup */ - err = usbd_req_set_device_feature(udev, - NULL, UF_DEVICE_REMOTE_WAKEUP); + err = usbd_set_dev_wakeup(udev); if (err) { DPRINTFN(0, "Setting device " "remote wakeup failed\n"); @@ -2804,8 +2846,7 @@ repeat: if (err != 0) { if (usb_peer_can_wakeup(udev)) { /* allow device to do remote wakeup */ - err = usbd_req_clear_device_feature(udev, - NULL, UF_DEVICE_REMOTE_WAKEUP); + err = usbd_clear_dev_wakeup(udev); if (err) { DPRINTFN(0, "Setting device " "remote wakeup failed\n"); From owner-svn-src-stable-12@freebsd.org Thu Mar 26 18:05:42 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B9FED2A5B02; Thu, 26 Mar 2020 18:05:41 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pCZr3sX3z47vR; Thu, 26 Mar 2020 18:05:40 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A862AA4AF; Thu, 26 Mar 2020 17:55:56 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QHtubT027189; Thu, 26 Mar 2020 17:55:56 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QHtuxA027188; Thu, 26 Mar 2020 17:55:56 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202003261755.02QHtuxA027188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 26 Mar 2020 17:55:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359339 - stable/12/etc X-SVN-Group: stable-12 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: stable/12/etc X-SVN-Commit-Revision: 359339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 18:05:42 -0000 Author: brooks Date: Thu Mar 26 17:55:56 2020 New Revision: 359339 URL: https://svnweb.freebsd.org/changeset/base/359339 Log: MFC r359247: Add the tests user, an unprivileged user from the default kyua config. This is a preparatory commit for D24103. Reviewed by: emaste Obtained from: CheriBSD Sponsored by: DARPA Modified: stable/12/etc/master.passwd Directory Properties: stable/12/ (props changed) Modified: stable/12/etc/master.passwd ============================================================================== --- stable/12/etc/master.passwd Thu Mar 26 17:46:32 2020 (r359338) +++ stable/12/etc/master.passwd Thu Mar 26 17:55:56 2020 (r359339) @@ -25,4 +25,5 @@ www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/us ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin _ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +tests:*:977:65534::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin From owner-svn-src-stable-12@freebsd.org Fri Mar 27 04:05:33 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC07C269B6C; Fri, 27 Mar 2020 04:05:33 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pSv02mh6z3yQZ; Fri, 27 Mar 2020 04:05:32 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7BCA1A6C0; Fri, 27 Mar 2020 03:58:01 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02R3w1e0088074; Fri, 27 Mar 2020 03:58:01 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02R3w1FG088072; Fri, 27 Mar 2020 03:58:01 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003270358.02R3w1FG088072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 27 Mar 2020 03:58:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359351 - stable/12/sys/dev/cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe X-SVN-Commit-Revision: 359351 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 04:05:34 -0000 Author: np Date: Fri Mar 27 03:58:00 2020 New Revision: 359351 URL: https://svnweb.freebsd.org/changeset/base/359351 Log: MFC r359159: cxgbe(4): Split sge_nm_rxq into three cachelines. This reduces the lines bouncing around between the driver rx ithread and the netmap rxsync thread. There is no net change in the size of the struct (it continues to waste a lot of space). This kind of split was originally proposed in D17869 by Marc De La Gueronniere @ Verisign, Inc. Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/adapter.h stable/12/sys/dev/cxgbe/t4_netmap.c stable/12/sys/dev/cxgbe/t4_sge.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/adapter.h ============================================================================== --- stable/12/sys/dev/cxgbe/adapter.h Fri Mar 27 03:18:52 2020 (r359350) +++ stable/12/sys/dev/cxgbe/adapter.h Fri Mar 27 03:58:00 2020 (r359351) @@ -677,7 +677,9 @@ struct sge_wrq { #define INVALID_NM_RXQ_CNTXT_ID ((uint16_t)(-1)) struct sge_nm_rxq { - volatile int nm_state; /* NM_OFF, NM_ON, or NM_BUSY */ + /* Items used by the driver rx ithread are in this cacheline. */ + volatile int nm_state __aligned(CACHE_LINE_SIZE); /* NM_OFF, NM_ON, or NM_BUSY */ + u_int nid; /* netmap ring # for this queue */ struct vi_info *vi; struct iq_desc *iq_desc; @@ -686,20 +688,23 @@ struct sge_nm_rxq { uint16_t iq_cidx; uint16_t iq_sidx; uint8_t iq_gen; + uint32_t fl_sidx; - __be64 *fl_desc; + /* Items used by netmap rxsync are in this cacheline. */ + __be64 *fl_desc __aligned(CACHE_LINE_SIZE); uint16_t fl_cntxt_id; - uint32_t fl_cidx; uint32_t fl_pidx; - uint32_t fl_sidx; + uint32_t fl_sidx2; /* copy of fl_sidx */ uint32_t fl_db_val; + u_int fl_db_saved; u_int fl_hwidx:4; - u_int fl_db_saved; - u_int nid; /* netmap ring # for this queue */ + /* + * fl_cidx is used by both the ithread and rxsync, the rest are not used + * in the rx fast path. + */ + uint32_t fl_cidx __aligned(CACHE_LINE_SIZE); - /* infrequently used items after this */ - bus_dma_tag_t iq_desc_tag; bus_dmamap_t iq_desc_map; bus_addr_t iq_ba; @@ -708,7 +713,7 @@ struct sge_nm_rxq { bus_dma_tag_t fl_desc_tag; bus_dmamap_t fl_desc_map; bus_addr_t fl_ba; -} __aligned(CACHE_LINE_SIZE); +}; #define INVALID_NM_TXQ_CNTXT_ID ((u_int)(-1)) struct sge_nm_txq { Modified: stable/12/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_netmap.c Fri Mar 27 03:18:52 2020 (r359350) +++ stable/12/sys/dev/cxgbe/t4_netmap.c Fri Mar 27 03:58:00 2020 (r359351) @@ -916,7 +916,7 @@ cxgbe_netmap_rxsync(struct netmap_kring *kring, int fl MPASS((n & 7) == 0); IDXINCR(kring->nr_hwcur, n, kring->nkr_num_slots); - IDXINCR(nm_rxq->fl_pidx, n, nm_rxq->fl_sidx); + IDXINCR(nm_rxq->fl_pidx, n, nm_rxq->fl_sidx2); while (n > 0) { for (i = 0; i < 8; i++, fl_pidx++, slot++) { @@ -924,10 +924,10 @@ cxgbe_netmap_rxsync(struct netmap_kring *kring, int fl MPASS(ba != 0); nm_rxq->fl_desc[fl_pidx] = htobe64(ba | hwidx); slot->flags &= ~NS_BUF_CHANGED; - MPASS(fl_pidx <= nm_rxq->fl_sidx); + MPASS(fl_pidx <= nm_rxq->fl_sidx2); } n -= 8; - if (fl_pidx == nm_rxq->fl_sidx) { + if (fl_pidx == nm_rxq->fl_sidx2) { fl_pidx = 0; slot = &ring->slot[0]; } Modified: stable/12/sys/dev/cxgbe/t4_sge.c ============================================================================== --- stable/12/sys/dev/cxgbe/t4_sge.c Fri Mar 27 03:18:52 2020 (r359350) +++ stable/12/sys/dev/cxgbe/t4_sge.c Fri Mar 27 03:58:00 2020 (r359351) @@ -3587,6 +3587,7 @@ alloc_nm_rxq(struct vi_info *vi, struct sge_nm_rxq *nm nm_rxq->iq_gen = F_RSPD_GEN; nm_rxq->fl_pidx = nm_rxq->fl_cidx = 0; nm_rxq->fl_sidx = na->num_rx_desc; + nm_rxq->fl_sidx2 = nm_rxq->fl_sidx; /* copy for rxsync cacheline */ nm_rxq->intr_idx = intr_idx; nm_rxq->iq_cntxt_id = INVALID_NM_RXQ_CNTXT_ID; From owner-svn-src-stable-12@freebsd.org Fri Mar 27 09:55:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DBCF27015F; Fri, 27 Mar 2020 09:55:18 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pcfX2DVVz49Vs; Fri, 27 Mar 2020 09:55:16 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC91A1EF82; Fri, 27 Mar 2020 09:55:08 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02R9t8BK002473; Fri, 27 Mar 2020 09:55:08 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02R9t8hK002472; Fri, 27 Mar 2020 09:55:08 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003270955.02R9t8hK002472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 27 Mar 2020 09:55:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359352 - stable/12/usr.bin/su X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/usr.bin/su X-SVN-Commit-Revision: 359352 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 09:55:18 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 27 09:55:08 2020 New Revision: 359352 URL: https://svnweb.freebsd.org/changeset/base/359352 Log: MFC 359340: Do not use macros in -width They do not expand. Modified: stable/12/usr.bin/su/su.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/su/su.1 ============================================================================== --- stable/12/usr.bin/su/su.1 Fri Mar 27 03:58:00 2020 (r359351) +++ stable/12/usr.bin/su/su.1 Fri Mar 27 09:55:08 2020 (r359352) @@ -28,7 +28,7 @@ .\" @(#)su.1 8.2 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 11, 2013 +.Dd March 26, 2020 .Dt SU 1 .Os .Sh NAME @@ -187,7 +187,7 @@ The user ID is always the effective ID (the target use unless the user ID is 0 (root). .El .Sh FILES -.Bl -tag -width ".Pa /etc/pam.d/su" -compact +.Bl -tag -width "/etc/pam.d/su" -compact .It Pa /etc/pam.d/su PAM configuration for .Nm . From owner-svn-src-stable-12@freebsd.org Fri Mar 27 09:57:37 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6B122702B0; Fri, 27 Mar 2020 09:57:37 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pcjC1SSqz4BNr; Fri, 27 Mar 2020 09:57:33 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C5171EF92; Fri, 27 Mar 2020 09:57:28 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02R9vRru002654; Fri, 27 Mar 2020 09:57:27 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02R9vRKF002653; Fri, 27 Mar 2020 09:57:27 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003270957.02R9vRKF002653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 27 Mar 2020 09:57:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359354 - stable/12/share/man/man3 X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/share/man/man3 X-SVN-Commit-Revision: 359354 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 09:57:37 -0000 Author: 0mp (doc,ports committer) Date: Fri Mar 27 09:57:27 2020 New Revision: 359354 URL: https://svnweb.freebsd.org/changeset/base/359354 Log: MFC 358954: CMSG_DATA.3: Fix formatting of printf escape sequences Escape sequences like "\n" have to be escaped twice in examples in our mdoc(7)-based manual pages in order to be displayed properly. The problem is that otherwise they are interpreted by mdoc(7), which results in: printf("parent: received '%s'0, buf); being shown to the user instead of: printf("parent: received '%s'\n", buf); Approved by: bcr (mentor) Differential Revision: https://reviews.freebsd.org/D24056 Modified: stable/12/share/man/man3/CMSG_DATA.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man3/CMSG_DATA.3 ============================================================================== --- stable/12/share/man/man3/CMSG_DATA.3 Fri Mar 27 09:55:53 2020 (r359353) +++ stable/12/share/man/man3/CMSG_DATA.3 Fri Mar 27 09:57:27 2020 (r359354) @@ -2,7 +2,7 @@ .\" Public domain, July 3, 2005 .\" .\" $FreeBSD$ -.Dd November 1, 2018 +.Dd March 13, 2020 .Dt CMSG_DATA 3 .Os .Sh NAME @@ -142,7 +142,7 @@ main() cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { hellofd[1] = *(int *)CMSG_DATA(cmsg); - printf("child: sending '%s'\n", buf); + printf("child: sending '%s'\\n", buf); if (write(hellofd[1], buf, HELLOLEN) == -1) err(EX_IOERR, "failed to send 'hello'"); } @@ -166,7 +166,7 @@ main() if (read(hellofd[0], buf, HELLOLEN) == -1) err(EX_IOERR, "faild to receive 'hello'"); - printf("parent: received '%s'\n", buf); + printf("parent: received '%s'\\n", buf); break; } From owner-svn-src-stable-12@freebsd.org Fri Mar 27 13:29:31 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 883D7275D1C; Fri, 27 Mar 2020 13:29:31 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pjPk0B6Lz4X4k; Fri, 27 Mar 2020 13:29:30 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 342B621C1E; Fri, 27 Mar 2020 13:29:25 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RDTOx3028316; Fri, 27 Mar 2020 13:29:24 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RDTOsN028314; Fri, 27 Mar 2020 13:29:24 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202003271329.02RDTOsN028314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 27 Mar 2020 13:29:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359358 - in stable/12/sys/dev: mpr mps X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: in stable/12/sys/dev: mpr mps X-SVN-Commit-Revision: 359358 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 13:29:32 -0000 Author: mav Date: Fri Mar 27 13:29:24 2020 New Revision: 359358 URL: https://svnweb.freebsd.org/changeset/base/359358 Log: MFC r358959: Increase buffer in mprsas_log_command() from 192 to 224 bytes. 192 bytes are not enough to print long commands, such as ATA COMMAND PASS THROUGH(16), that makes debug output difficult to read. Modified: stable/12/sys/dev/mpr/mpr_sas.c stable/12/sys/dev/mps/mps_sas.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/mpr/mpr_sas.c ============================================================================== --- stable/12/sys/dev/mpr/mpr_sas.c Fri Mar 27 11:08:11 2020 (r359357) +++ stable/12/sys/dev/mpr/mpr_sas.c Fri Mar 27 13:29:24 2020 (r359358) @@ -327,7 +327,7 @@ mprsas_log_command(struct mpr_command *cm, u_int level { struct sbuf sb; va_list ap; - char str[192]; + char str[224]; char path_str[64]; if (cm == NULL) Modified: stable/12/sys/dev/mps/mps_sas.c ============================================================================== --- stable/12/sys/dev/mps/mps_sas.c Fri Mar 27 11:08:11 2020 (r359357) +++ stable/12/sys/dev/mps/mps_sas.c Fri Mar 27 13:29:24 2020 (r359358) @@ -321,7 +321,7 @@ mpssas_log_command(struct mps_command *cm, u_int level { struct sbuf sb; va_list ap; - char str[192]; + char str[224]; char path_str[64]; if (cm == NULL) From owner-svn-src-stable-12@freebsd.org Fri Mar 27 15:20:27 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B43AB2784E2; Fri, 27 Mar 2020 15:20:27 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48plsk5q4lz4G3b; Fri, 27 Mar 2020 15:20:26 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7309C232CD; Fri, 27 Mar 2020 15:20:20 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RFKKM4095379; Fri, 27 Mar 2020 15:20:20 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RFKJN9095377; Fri, 27 Mar 2020 15:20:19 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202003271520.02RFKJN9095377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 27 Mar 2020 15:20:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359360 - in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt X-SVN-Group: stable-12 X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt X-SVN-Commit-Revision: 359360 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:20:27 -0000 Author: jhibbits Date: Fri Mar 27 15:20:19 2020 New Revision: 359360 URL: https://svnweb.freebsd.org/changeset/base/359360 Log: MFC r359279: ismt: Fix ISMT_DESC_ADDR_RW macro, slave addresses are already left-shifted Reverts r293369. The macro was orginally correct, since our SMBus framework, unlike i2c, already requires addresses to be 8-bit, LSB-cleared. Sponsored by: Juniper Networks, Inc Modified: stable/12/sys/dev/ichwd/ichwd.c stable/12/sys/dev/ichwd/ichwd.h stable/12/sys/dev/ismt/ismt.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/dev/ismt/ismt.c Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/dev/ichwd/ichwd.c ============================================================================== --- stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 13:29:53 2020 (r359359) +++ stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 15:20:19 2020 (r359360) @@ -296,6 +296,7 @@ static struct ichwd_device ichwd_devices[] = { static struct ichwd_device ichwd_smb_devices[] = { { DEVICEID_LEWISBURG_SMB, "Lewisburg watchdog timer", 10, 4 }, { DEVICEID_SRPTLP_SMB, "Sunrise Point-LP watchdog timer", 10, 4 }, + { DEVICEID_C3000, "Intel Atom C3000 watchdog timer", 10, 4 }, { 0, NULL, 0, 0 }, }; Modified: stable/12/sys/dev/ichwd/ichwd.h ============================================================================== --- stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 13:29:53 2020 (r359359) +++ stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 15:20:19 2020 (r359360) @@ -67,6 +67,7 @@ struct ichwd_softc { #define VENDORID_INTEL 0x8086 #define DEVICEID_BAYTRAIL 0x0f1c +#define DEVICEID_C3000 0x19df #define DEVICEID_CPT0 0x1c40 #define DEVICEID_CPT1 0x1c41 #define DEVICEID_CPT2 0x1c42 Modified: stable/12/sys/dev/ismt/ismt.c ============================================================================== --- stable/12/sys/dev/ismt/ismt.c Fri Mar 27 13:29:53 2020 (r359359) +++ stable/12/sys/dev/ismt/ismt.c Fri Mar 27 15:20:19 2020 (r359360) @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #define ISMT_DESC_LPR 0x80 /* Large Packet Received */ /* Macros */ -#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr << 1) | (is_read)) +#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr) | (is_read)) /* iSMT General Register address offsets (SMBBAR + ) */ #define ISMT_GR_GCTRL 0x000 /* General Control */ From owner-svn-src-stable-12@freebsd.org Fri Mar 27 15:26:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A47A82787AC; Fri, 27 Mar 2020 15:26:05 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48plzy5F5gz4J4s; Fri, 27 Mar 2020 15:25:50 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-il1-f193.google.com with SMTP id 7so9107118ill.2; Fri, 27 Mar 2020 08:25:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=v2/2iJZbOC/50st9Lgwh+2xx6UVMV/7Lr2BOZPaJ7nI=; b=ezo3V1wyN5DEKlPSvKe4Wsgmb4meKWSJ8b0SrqPIvPIC7SFjiJ+YKCyPJuAjV482lT eyQsEV5aFzqT77fkLEOOItmpIcMYIDt1RWHDTc7D+d9+iaDpnYzbX7ZtBb1JYm2BlJCV PwJgOx+AV+ZydMcxsBV3VaMRfSLF9ttp8eq/89/NAhFmsmqQjLZApNNKoi13nVn5g0by sIKjcmxVjnrmzljlWPAsE6tbdITBlX1gPH/r51aeRWdv5XBbvLq9/oIsewa6nBlRbQQk MnDAiu0WBB2EVK26UnswJf8Ndq67tZ784jSyACB32+jj/UKWH4Fcgl9virkoR5mw+Gx6 EC9A== X-Gm-Message-State: ANhLgQ2psycEqTilztiMLXrUISTqSfBYYu4Nn0tRSSVHb+RQ2oo0X9Tp glSy0XgA6D81yXIGNWrIFtgT/vyKmsKr0n/0KWClWzuvZUM= X-Google-Smtp-Source: ADFU+vtQ5d+We17JknS+ZEkqOhg0XLzzqjyj3By/HtT4R4cP8cGH0GY4wmYI5G0F4GWM1WJ1M0Qh+oPwJ/vQo34rlss= X-Received: by 2002:a92:88d0:: with SMTP id m77mr13330270ilh.282.1585322741902; Fri, 27 Mar 2020 08:25:41 -0700 (PDT) MIME-Version: 1.0 References: <202003271520.02RFKJN9095377@repo.freebsd.org> In-Reply-To: <202003271520.02RFKJN9095377@repo.freebsd.org> From: Justin Hibbits Date: Fri, 27 Mar 2020 10:25:30 -0500 Message-ID: Subject: Re: svn commit: r359360 - in stable: 11/sys/dev/ismt 12/sys/dev/ichwd 12/sys/dev/ismt To: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48plzy5F5gz4J4s X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of chmeeedalf@gmail.com designates 209.85.166.193 as permitted sender) smtp.mailfrom=chmeeedalf@gmail.com X-Spamd-Result: default: False [-2.33 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-0.34)[ip: (-0.03), ipnet: 209.85.128.0/17(-1.13), asn: 15169(-0.47), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[193.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[jhibbits@freebsd.org,chmeeedalf@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[193.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[jhibbits@freebsd.org,chmeeedalf@gmail.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:26:05 -0000 On Fri, Mar 27, 2020 at 10:21 AM Justin Hibbits wrote: > > Author: jhibbits > Date: Fri Mar 27 15:20:19 2020 > New Revision: 359360 > URL: https://svnweb.freebsd.org/changeset/base/359360 > > Log: > MFC r359279: > > ismt: Fix ISMT_DESC_ADDR_RW macro, slave addresses are already left-shifted > > Reverts r293369. The macro was orginally correct, since our SMBus > framework, unlike i2c, already requires addresses to be 8-bit, LSB-cleared. > > Sponsored by: Juniper Networks, Inc > > Modified: > stable/12/sys/dev/ichwd/ichwd.c > stable/12/sys/dev/ichwd/ichwd.h > stable/12/sys/dev/ismt/ismt.c > Directory Properties: > stable/12/ (props changed) > > Changes in other areas also in this revision: > Modified: > stable/11/sys/dev/ismt/ismt.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/12/sys/dev/ichwd/ichwd.c > ============================================================================== > --- stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/sys/dev/ichwd/ichwd.c Fri Mar 27 15:20:19 2020 (r359360) > @@ -296,6 +296,7 @@ static struct ichwd_device ichwd_devices[] = { > static struct ichwd_device ichwd_smb_devices[] = { > { DEVICEID_LEWISBURG_SMB, "Lewisburg watchdog timer", 10, 4 }, > { DEVICEID_SRPTLP_SMB, "Sunrise Point-LP watchdog timer", 10, 4 }, > + { DEVICEID_C3000, "Intel Atom C3000 watchdog timer", 10, 4 }, > { 0, NULL, 0, 0 }, > }; > > > Modified: stable/12/sys/dev/ichwd/ichwd.h > ============================================================================== > --- stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/sys/dev/ichwd/ichwd.h Fri Mar 27 15:20:19 2020 (r359360) > @@ -67,6 +67,7 @@ struct ichwd_softc { > > #define VENDORID_INTEL 0x8086 > #define DEVICEID_BAYTRAIL 0x0f1c > +#define DEVICEID_C3000 0x19df > #define DEVICEID_CPT0 0x1c40 > #define DEVICEID_CPT1 0x1c41 > #define DEVICEID_CPT2 0x1c42 > > Modified: stable/12/sys/dev/ismt/ismt.c > ============================================================================== > --- stable/12/sys/dev/ismt/ismt.c Fri Mar 27 13:29:53 2020 (r359359) > +++ stable/12/sys/dev/ismt/ismt.c Fri Mar 27 15:20:19 2020 (r359360) > @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); > #define ISMT_DESC_LPR 0x80 /* Large Packet Received */ > > /* Macros */ > -#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr << 1) | (is_read)) > +#define ISMT_DESC_ADDR_RW(addr, is_read) ((addr) | (is_read)) > > /* iSMT General Register address offsets (SMBBAR + ) */ > #define ISMT_GR_GCTRL 0x000 /* General Control */ And this includes the changes to be MFC'd by r359285. MFC'ing that now, so not reverting. Oops. - Justin From owner-svn-src-stable-12@freebsd.org Fri Mar 27 15:26:37 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28F0B27880A; Fri, 27 Mar 2020 15:26:37 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pm0r4W9Lz4JKr; Fri, 27 Mar 2020 15:26:36 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86046234A9; Fri, 27 Mar 2020 15:26:31 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RFQUfH001734; Fri, 27 Mar 2020 15:26:30 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RFQUwS001733; Fri, 27 Mar 2020 15:26:30 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202003271526.02RFQUwS001733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 27 Mar 2020 15:26:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359361 - in stable: 11/sys/dev/ichwd 12/sys/dev/ichwd X-SVN-Group: stable-12 X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in stable: 11/sys/dev/ichwd 12/sys/dev/ichwd X-SVN-Commit-Revision: 359361 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:26:37 -0000 Author: jhibbits Date: Fri Mar 27 15:26:30 2020 New Revision: 359361 URL: https://svnweb.freebsd.org/changeset/base/359361 Log: MFC r359285: ichwd: Add Atom C3000 watchdog ID. Sponsored by: Juniper Networks, Inc Modified: stable/12/sys/dev/ichwd/ichwd.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/dev/ichwd/ichwd.c stable/11/sys/dev/ichwd/ichwd.h Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/dev/ichwd/ichwd.c ============================================================================== From owner-svn-src-stable-12@freebsd.org Fri Mar 27 17:04:58 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3B1627B444; Fri, 27 Mar 2020 17:04:58 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ppBK3NGgz3xg9; Fri, 27 Mar 2020 17:04:57 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17FD024A31; Fri, 27 Mar 2020 17:04:47 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RH4kdl061987; Fri, 27 Mar 2020 17:04:46 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RH4kf2061986; Fri, 27 Mar 2020 17:04:46 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003271704.02RH4kf2061986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 27 Mar 2020 17:04:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359369 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 359369 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 17:04:59 -0000 Author: markj Date: Fri Mar 27 17:04:46 2020 New Revision: 359369 URL: https://svnweb.freebsd.org/changeset/base/359369 Log: MFC r359184: Lock the socket in soo_stat(). Modified: stable/12/sys/kern/sys_socket.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/sys_socket.c ============================================================================== --- stable/12/sys/kern/sys_socket.c Fri Mar 27 16:05:37 2020 (r359368) +++ stable/12/sys/kern/sys_socket.c Fri Mar 27 17:04:46 2020 (r359369) @@ -287,9 +287,7 @@ soo_stat(struct file *fp, struct stat *ub, struct ucre struct thread *td) { struct socket *so = fp->f_data; -#ifdef MAC int error; -#endif bzero((caddr_t)ub, sizeof (*ub)); ub->st_mode = S_IFSOCK; @@ -298,6 +296,7 @@ soo_stat(struct file *fp, struct stat *ub, struct ucre if (error) return (error); #endif + SOCK_LOCK(so); if (!SOLISTENING(so)) { struct sockbuf *sb; @@ -320,7 +319,9 @@ soo_stat(struct file *fp, struct stat *ub, struct ucre } ub->st_uid = so->so_cred->cr_uid; ub->st_gid = so->so_cred->cr_gid; - return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub); + error = so->so_proto->pr_usrreqs->pru_sense(so, ub); + SOCK_UNLOCK(so); + return (error); } /* From owner-svn-src-stable-12@freebsd.org Fri Mar 27 17:06:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A49B527B533; Fri, 27 Mar 2020 17:06:36 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ppDC0yGpz3yF0; Fri, 27 Mar 2020 17:06:35 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FD9824A44; Fri, 27 Mar 2020 17:06:25 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RH6PX2062125; Fri, 27 Mar 2020 17:06:25 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RH6OnN062121; Fri, 27 Mar 2020 17:06:24 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202003271706.02RH6OnN062121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 27 Mar 2020 17:06:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359370 - in stable/12/contrib/elftoolchain: libdwarf libelftc libpe readelf X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/contrib/elftoolchain: libdwarf libelftc libpe readelf X-SVN-Commit-Revision: 359370 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 17:06:36 -0000 Author: markj Date: Fri Mar 27 17:06:24 2020 New Revision: 359370 URL: https://svnweb.freebsd.org/changeset/base/359370 Log: MFC r359172-r359176: elftoolchain coverity fixes Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c stable/12/contrib/elftoolchain/libpe/pe_symtab.c stable/12/contrib/elftoolchain/readelf/readelf.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_die.c Fri Mar 27 17:06:24 2020 (r359370) @@ -70,8 +70,7 @@ _dwarf_die_add(Dwarf_CU cu, uint64_t offset, uint64_t die->die_cu = cu; die->die_dbg = cu->cu_dbg; - if (diep != NULL) - *diep = die; + *diep = die; return (DW_DLE_NONE); } Modified: stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c ============================================================================== --- stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Mar 27 17:06:24 2020 (r359370) @@ -2912,7 +2912,7 @@ again: if (len <= 0) goto clean; if (!vector_str_push(&v.ext_name, ddata->cur, len)) - return (0); + goto clean; ddata->cur += len; if (!vector_type_qualifier_push(&v, TYPE_EXT)) goto clean; Modified: stable/12/contrib/elftoolchain/libpe/pe_symtab.c ============================================================================== --- stable/12/contrib/elftoolchain/libpe/pe_symtab.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/libpe/pe_symtab.c Fri Mar 27 17:06:24 2020 (r359370) @@ -33,7 +33,7 @@ ELFTC_VCSID("$Id: pe_symtab.c 3312 2016-01-10 09:23:51 int pe_update_symtab(PE *pe, char *symtab, size_t sz, unsigned int nsym) { - PE_Scn *ps; + PE_Scn *ps, *pstmp; PE_SecBuf *sb; PE_SecHdr *sh; @@ -48,7 +48,7 @@ pe_update_symtab(PE *pe, char *symtab, size_t sz, unsi } /* Remove the old symbol table. */ - STAILQ_FOREACH(ps, &pe->pe_scn, ps_next) { + STAILQ_FOREACH_SAFE(ps, &pe->pe_scn, ps_next, pstmp) { if (ps->ps_ndx == 0xFFFFFFFFU) libpe_release_scn(ps); } Modified: stable/12/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- stable/12/contrib/elftoolchain/readelf/readelf.c Fri Mar 27 17:04:46 2020 (r359369) +++ stable/12/contrib/elftoolchain/readelf/readelf.c Fri Mar 27 17:06:24 2020 (r359370) @@ -5915,6 +5915,7 @@ dump_dwarf_frame_regtable(struct readelf *re, Dwarf_Fd for (; cur_pc < end_pc; cur_pc++) { if (dwarf_get_fde_info_for_all_regs(fde, cur_pc, &rt, &row_pc, &de) != DW_DLV_OK) { + free(vec); warnx("dwarf_get_fde_info_for_all_regs failed: %s\n", dwarf_errmsg(de)); return (-1); @@ -7088,6 +7089,7 @@ dump_ar(struct readelf *re, int fd) } printf("Binary %s(%s) contains:\n", re->filename, arhdr->ar_name); + elf_end(e); } printf("\t%s\n", arsym[i].as_name); } From owner-svn-src-stable-12@freebsd.org Fri Mar 27 19:08:18 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C33D427E96A; Fri, 27 Mar 2020 19:08:18 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48prwf3qm4z3HCD; Fri, 27 Mar 2020 19:08:18 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8418E266F9; Fri, 27 Mar 2020 19:08:11 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RJ8BNv034988; Fri, 27 Mar 2020 19:08:11 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RJ8BYu034987; Fri, 27 Mar 2020 19:08:11 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003271908.02RJ8BYu034987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 27 Mar 2020 19:08:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359375 - stable/12/share/man/man9 X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/man/man9 X-SVN-Commit-Revision: 359375 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 19:08:18 -0000 Author: emaste Date: Fri Mar 27 19:08:10 2020 New Revision: 359375 URL: https://svnweb.freebsd.org/changeset/base/359375 Log: MFC r358314: style.9: update C99 commentary Make style.9 read as a current statement of C99 preferences, rather than a description of ongoing changes to our preferred style. Alsu use the short form "ISO C99" on the 2nd and later instances rather than repeating the unwieldy `ISO/IEC 9899:1999 ("ISO C99")` each time. Modified: stable/12/share/man/man9/style.9 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man9/style.9 ============================================================================== --- stable/12/share/man/man9/style.9 Fri Mar 27 18:25:23 2020 (r359374) +++ stable/12/share/man/man9/style.9 Fri Mar 27 19:08:10 2020 (r359375) @@ -279,11 +279,11 @@ is treated as #endif /* !COMPAT_43 */ .Ed .Pp -The project is slowly moving to use the +The project prefers the use of .St -isoC-99 unsigned integer identifiers of the form .Vt uintXX_t -in preference to the older +rather than the older .Bx Ns -style integer identifiers of the form .Vt u_intXX_t . @@ -295,10 +295,10 @@ Like white-space commits, care should be taken in maki .Vt uintXX_t only commits. .Pp -Similarly, the project is slowly moving to use the -.St -isoC-99 +Similarly, the project prefers the use of +ISO C99 .Vt bool -in preference to the older +rather than the older .Vt int or .Vt boolean_t . @@ -319,8 +319,8 @@ Userspace code should include while kernel code should include .In sys/types.h . .Pp -Likewise, the project is moving to using the -.St -isoC-99 +Likewise, the project prefers +ISO C99 designated initializers when it makes sense to do so. .Pp Enumeration values are all uppercase. From owner-svn-src-stable-12@freebsd.org Fri Mar 27 20:06:53 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACADA27FD94; Fri, 27 Mar 2020 20:06:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ptDF0nLvz48Zp; Fri, 27 Mar 2020 20:06:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56B332734E; Fri, 27 Mar 2020 20:06:44 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RK6ixi072970; Fri, 27 Mar 2020 20:06:44 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RK6e7k072950; Fri, 27 Mar 2020 20:06:40 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003272006.02RK6e7k072950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 27 Mar 2020 20:06:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359378 - in stable/12/sys: conf modules/cxgbe/iw_cxgbe modules/ibcore modules/ipoib modules/iser modules/linuxkpi modules/mlx4 modules/mlx4en modules/mlx4ib modules/mlx5 modules/mlx5en... X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12/sys: conf modules/cxgbe/iw_cxgbe modules/ibcore modules/ipoib modules/iser modules/linuxkpi modules/mlx4 modules/mlx4en modules/mlx4ib modules/mlx5 modules/mlx5en modules/mlx5fpga_tools m... X-SVN-Commit-Revision: 359378 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 20:06:54 -0000 Author: kib Date: Fri Mar 27 20:06:40 2020 New Revision: 359378 URL: https://svnweb.freebsd.org/changeset/base/359378 Log: MFC r359185: Introduce LINUXKPI_GENSRCS. For MFC, pci_iov_if.h is excluded from the list. It will be readded when linuxkpi support for SRIOV is merged. Sponsored by: Mellanox Technologies Modified: stable/12/sys/conf/kmod.mk stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile stable/12/sys/modules/ibcore/Makefile stable/12/sys/modules/ipoib/Makefile stable/12/sys/modules/iser/Makefile stable/12/sys/modules/linuxkpi/Makefile stable/12/sys/modules/mlx4/Makefile stable/12/sys/modules/mlx4en/Makefile stable/12/sys/modules/mlx4ib/Makefile stable/12/sys/modules/mlx5/Makefile stable/12/sys/modules/mlx5en/Makefile stable/12/sys/modules/mlx5fpga_tools/Makefile stable/12/sys/modules/mlx5ib/Makefile stable/12/sys/modules/mlxfw/Makefile stable/12/sys/modules/mthca/Makefile stable/12/sys/modules/qlnx/qlnxe/Makefile stable/12/sys/modules/qlnx/qlnxev/Makefile stable/12/sys/modules/rdma/krping/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/conf/kmod.mk ============================================================================== --- stable/12/sys/conf/kmod.mk Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/conf/kmod.mk Fri Mar 27 20:06:40 2020 (r359378) @@ -113,6 +113,15 @@ WERROR?= -Wno-error WERROR?= -Werror .endif +LINUXKPI_GENSRCS+= \ + bus_if.h \ + device_if.h \ + pci_if.h \ + vnode_if.h \ + usb_if.h \ + opt_usb.h \ + opt_stack.h + CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL CFLAGS+= -DKLD_MODULE Modified: stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile ============================================================================== --- stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/cxgbe/iw_cxgbe/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -4,24 +4,17 @@ CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe KMOD= iw_cxgbe -SRCS= bus_if.h SRCS+= cm.c SRCS+= cq.c SRCS+= device.c -SRCS+= device_if.h SRCS+= ev.c SRCS+= id_table.c SRCS+= mem.c -SRCS+= opt_inet.h -SRCS+= opt_ktr.h -SRCS+= opt_ofed.h -SRCS+= opt_sched.h -SRCS+= pci_if.h -SRCS+= pcib_if.h SRCS+= provider.c SRCS+= qp.c SRCS+= resource.c -SRCS+= vnode_if.h +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_ktr.h opt_ofed.h opt_sched.h CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/ibcore/Makefile ============================================================================== --- stable/12/sys/modules/ibcore/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/ibcore/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -2,8 +2,7 @@ .PATH: ${SRCTOP}/sys/ofed/drivers/infiniband/core KMOD= ibcore -SRCS= vnode_if.h device_if.h bus_if.h pci_if.h \ - opt_inet.h opt_inet6.h \ +SRCS= \ ib_addr.c \ ib_agent.c \ ib_cache.c \ @@ -32,6 +31,8 @@ SRCS= vnode_if.h device_if.h bus_if.h pci_if.h \ ib_uverbs_main.c \ ib_uverbs_marshall.c \ ib_verbs.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/ipoib/Makefile ============================================================================== --- stable/12/sys/modules/ipoib/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/ipoib/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -2,10 +2,10 @@ .PATH: ${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib KMOD= ipoib -SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h opt_ofed.h \ - ipoib_cm.c ipoib_ib.c ipoib_main.c \ +SRCS= ipoib_cm.c ipoib_ib.c ipoib_main.c \ ipoib_multicast.c ipoib_verbs.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_ofed.h CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib CFLAGS+= -I${SRCTOP}/sys/ofed/include Modified: stable/12/sys/modules/iser/Makefile ============================================================================== --- stable/12/sys/modules/iser/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/iser/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -11,13 +11,9 @@ SRCS= icl_iser.c SRCS+= iser_initiator.c SRCS+= iser_memory.c SRCS+= iser_verbs.c -SRCS+= vnode_if.h -SRCS+= opt_inet.h -SRCS+= opt_inet6.h -SRCS+= opt_cam.h -SRCS+= bus_if.h -SRCS+= device_if.h -SRCS+= icl_conn_if.h + +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_cam.h icl_conn_if.h CFLAGS+= -I${SYSDIR}/ CFLAGS+= -I${SYSDIR}/ofed/include Modified: stable/12/sys/modules/linuxkpi/Makefile ============================================================================== --- stable/12/sys/modules/linuxkpi/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/linuxkpi/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -19,13 +19,7 @@ SRCS= linux_compat.c \ linux_usb.c \ linux_work.c -SRCS+= bus_if.h \ - device_if.h \ - pci_if.h \ - vnode_if.h \ - usb_if.h \ - opt_usb.h \ - opt_stack.h +SRCS+= ${LINUXKPI_GENSRCS} CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include Modified: stable/12/sys/modules/mlx4/Makefile ============================================================================== --- stable/12/sys/modules/mlx4/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx4/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -2,8 +2,7 @@ .PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_core KMOD= mlx4 -SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h \ +SRCS= \ mlx4_alloc.c \ mlx4_catas.c \ mlx4_cmd.c \ @@ -24,6 +23,8 @@ SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ mlx4_sense.c \ mlx4_srq.c \ mlx4_resource_tracker.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/mlx4en/Makefile ============================================================================== --- stable/12/sys/modules/mlx4en/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx4en/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -2,8 +2,7 @@ .PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_en KMOD= mlx4en -SRCS= device_if.h bus_if.h pci_if.h vnode_if.h \ - opt_inet.h opt_inet6.h \ +SRCS= \ mlx4_en_cq.c \ mlx4_en_main.c \ mlx4_en_netdev.c \ @@ -11,6 +10,8 @@ SRCS= device_if.h bus_if.h pci_if.h vnode_if.h \ mlx4_en_resources.c \ mlx4_en_rx.c \ mlx4_en_tx.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include Modified: stable/12/sys/modules/mlx4ib/Makefile ============================================================================== --- stable/12/sys/modules/mlx4ib/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx4ib/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -2,8 +2,7 @@ .PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_ib KMOD= mlx4ib -SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h \ +SRCS= \ mlx4_ib_alias_GUID.c \ mlx4_ib_mcg.c \ mlx4_ib_sysfs.c \ @@ -17,6 +16,8 @@ SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ mlx4_ib_srq.c \ mlx4_ib_wc.c \ mlx4_ib_cm.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/mlx5/Makefile ============================================================================== --- stable/12/sys/modules/mlx5/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx5/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -31,9 +31,9 @@ mlx5_uar.c \ mlx5_vport.c \ mlx5_vsc.c \ mlx5_wq.c \ -mlx5_gid.c \ -device_if.h bus_if.h vnode_if.h pci_if.h \ -opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h +mlx5_gid.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include Modified: stable/12/sys/modules/mlx5en/Makefile ============================================================================== --- stable/12/sys/modules/mlx5en/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx5en/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -11,9 +11,9 @@ mlx5_en_flow_table.c \ mlx5_en_rx.c \ mlx5_en_rl.c \ mlx5_en_txrx.c \ -mlx5_en_port_buffer.c \ -device_if.h bus_if.h vnode_if.h pci_if.h \ -opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h +mlx5_en_port_buffer.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h .if defined(HAVE_PER_CQ_EVENT_PACKET) CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET Modified: stable/12/sys/modules/mlx5fpga_tools/Makefile ============================================================================== --- stable/12/sys/modules/mlx5fpga_tools/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx5fpga_tools/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -6,9 +6,8 @@ SRCS= \ mlx5fpga_tools_main.c \ mlx5fpga_tools_char.c -SRCS+= \ - device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include Modified: stable/12/sys/modules/mlx5ib/Makefile ============================================================================== --- stable/12/sys/modules/mlx5ib/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlx5ib/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -14,9 +14,9 @@ mlx5_ib_mem.c \ mlx5_ib_mr.c \ mlx5_ib_qp.c \ mlx5_ib_srq.c \ -mlx5_ib_virt.c \ -device_if.h bus_if.h vnode_if.h pci_if.h \ -opt_inet.h opt_inet6.h opt_ratelimit.h +mlx5_ib_virt.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h opt_ratelimit.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/mlxfw/Makefile ============================================================================== --- stable/12/sys/modules/mlxfw/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mlxfw/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -5,8 +5,8 @@ KMOD=mlxfw SRCS= \ mlxfw_fsm.c \ mlxfw_mfa2.c \ -mlxfw_mfa2_tlv_multi.c \ -device_if.h bus_if.h vnode_if.h pci_if.h +mlxfw_mfa2_tlv_multi.c +SRCS+= ${LINUXKPI_GENSRCS} CFLAGS+= \ -I${SRCTOP}/sys/ofed/include \ Modified: stable/12/sys/modules/mthca/Makefile ============================================================================== --- stable/12/sys/modules/mthca/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/mthca/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -20,9 +20,9 @@ mthca_provider.c \ mthca_qp.c \ mthca_reset.c \ mthca_srq.c \ -mthca_uar.c \ -device_if.h bus_if.h vnode_if.h pci_if.h \ - opt_inet.h opt_inet6.h +mthca_uar.c +SRCS+= ${LINUXKPI_GENSRCS} +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi Modified: stable/12/sys/modules/qlnx/qlnxe/Makefile ============================================================================== --- stable/12/sys/modules/qlnx/qlnxe/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/qlnx/qlnxe/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -50,11 +50,7 @@ SRCS+=ecore_vf.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c -SRCS+= device_if.h -SRCS+= bus_if.h -SRCS+= pci_if.h -SRCS+= pci_iov_if.h - +SRCS+= ${LINUXKPI_GENSRCS} .include Modified: stable/12/sys/modules/qlnx/qlnxev/Makefile ============================================================================== --- stable/12/sys/modules/qlnx/qlnxev/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/qlnx/qlnxev/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -51,10 +51,7 @@ SRCS+=ecore_vf.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c -SRCS+= device_if.h -SRCS+= bus_if.h -SRCS+= pci_if.h -SRCS+= pci_iov_if.h +SRCS+= ${LINUXKPI_GENSRCS} .include Modified: stable/12/sys/modules/rdma/krping/Makefile ============================================================================== --- stable/12/sys/modules/rdma/krping/Makefile Fri Mar 27 19:39:14 2020 (r359377) +++ stable/12/sys/modules/rdma/krping/Makefile Fri Mar 27 20:06:40 2020 (r359378) @@ -3,7 +3,7 @@ KMOD= krping SRCS= krping.c krping_dev.c getopt.c -SRCS+= bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h +SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_sched.h opt_inet.h opt_inet6.h CFLAGS+= -I${SRCTOP}/sys/ofed/include CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi From owner-svn-src-stable-12@freebsd.org Sat Mar 28 08:15:29 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B68C5274556; Sat, 28 Mar 2020 08:15:29 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qBNv023pz4Wt2; Sat, 28 Mar 2020 08:15:26 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23C6493A0; Sat, 28 Mar 2020 08:15:19 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02S8FIQ5022830; Sat, 28 Mar 2020 08:15:18 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02S8FIMX022829; Sat, 28 Mar 2020 08:15:18 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202003280815.02S8FIMX022829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Sat, 28 Mar 2020 08:15:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359390 - stable/12/share/man/man5 X-SVN-Group: stable-12 X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: stable/12/share/man/man5 X-SVN-Commit-Revision: 359390 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 08:15:29 -0000 Author: 0mp (doc,ports committer) Date: Sat Mar 28 08:15:18 2020 New Revision: 359390 URL: https://svnweb.freebsd.org/changeset/base/359390 Log: MFC 359299: Fix formatting Previously, the whole "jail_* variables" string would be stylized as a variable. This is incorrect. Modified: stable/12/share/man/man5/rc.conf.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man5/rc.conf.5 ============================================================================== --- stable/12/share/man/man5/rc.conf.5 Sat Mar 28 04:02:00 2020 (r359389) +++ stable/12/share/man/man5/rc.conf.5 Sat Mar 28 08:15:18 2020 (r359390) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 21, 2019 +.Dd March 25, 2020 .Dt RC.CONF 5 .Os .Sh NAME @@ -3892,7 +3892,7 @@ When set to all configured jails in .Va jail_list are stopped in reverse order. -.It Va jail_* variables +.It Va jail_ Ns * variables Note that older releases supported per-jail configuration via .Nm variables.